recog 2.3.8 → 2.3.13

data/xml/hp_pjl_id.xml

@@ -1,17 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <fingerprints protocol="pjl" database_type="service" preference="0.10">
   <!--
   For printers running the PJL protocol (usually on 9100/tcp), their type can be requested
   by the INFO ID command. The printer types (strings surrounded by double quotes) are
   matched against these patterns to fingerprint the printer.
-
   'preference' notes: The value has been explicitly set to 0.10 due to the very loose
   regex that is used here.
   -->
+
   <!--
    LaserJet and Designjet are registered trademarks of HP. Therefore matching for the keywords
    is sufficient for asserting all relevant information
    -->
+
   <fingerprint pattern="(?i)laserjet (.*)(?: series)?">
     <description>HP JetDirect Printer</description>
     <example>HP LaserJet 4100 Series</example>
@@ -27,6 +28,7 @@
     <param pos="0" name="os.family" value="LaserJet"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="(?i)(designjet \S+)">
     <description>HP Designjet printer</description>
     <example>hp designjet 110plus</example>
@@ -41,6 +43,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^Xerox ColorQube (\S+)$">
     <description>Xerox ColorQube Multifunction Printer</description>
     <example>Xerox ColorQube 8570DN</example>
@@ -51,6 +54,7 @@
     <param pos="1" name="os.product"/>
     <param pos="0" name="os.device" value="Multifunction Device"/>
   </fingerprint>
+
   <fingerprint pattern="^Brother (.+)$">
     <description>Brother Printer</description>
     <example>Brother HL-1660e</example>
@@ -58,7 +62,9 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <!-- Assert the product range as a product fingerprint. -->
+
   <fingerprint pattern="^(iR ?\S+)">
     <description>Canon iR multifunction device</description>
     <example>iR 3180C EUR</example>
@@ -69,6 +75,7 @@
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:Dell (?:Color Laser |Laser Printer )?|(?:Color Laser |Laser Printer ))(\d+(?:n|cn|dn|cdn))(?: Color Laser| Laser Printer)?$">
     <description>Dell Laser Printer</description>
     <example>Dell Laser Printer 1710n</example>
@@ -86,6 +93,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^Dell (\d+(?:n|cn|dn|cdn)) MFP$">
     <description>Dell Laser multifunction device</description>
     <example>Dell 2135cn MFP</example>
@@ -95,6 +103,7 @@
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^HP (\S+ Digital Sender)$">
     <description>HP Digital Sender scanner</description>
     <example>HP 9250C Digital Sender</example>
@@ -103,6 +112,7 @@
     <param pos="0" name="os.family" value="Digital Sender"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:IBM )?Infoprint(?: Color)? (\S+)$">
     <description>IBM Infoprint Printer</description>
     <param pos="0" name="os.vendor" value="IBM"/>
@@ -110,6 +120,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^KM-(.*)$">
     <description>Konica Minolta printer</description>
     <example>KM-5050</example>
@@ -117,6 +128,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^(FS-\S+MFP\S*)$">
     <description>Kyocera Mita Multifunction device</description>
     <example>FS-C2126MFP</example>
@@ -127,6 +139,7 @@
     <param pos="0" name="os.family" value="FS"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^(FS-(?:C)?\d+(?:D|DN))$">
     <description>Kyocera Mita Printer</description>
     <example>FS-C8500DN</example>
@@ -137,6 +150,7 @@
     <param pos="0" name="os.family" value="FS"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^(TASKalfa \S+)$">
     <description>Kyocera Mita TASKalfa multifunction device</description>
     <example>TASKalfa 300ci</example>
@@ -147,6 +161,7 @@
     <param pos="0" name="os.family" value="TASKalfa"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^Lexmark (.*)$">
     <description>Lexmark JetDirect printer</description>
     <example>Lexmark C910</example>
@@ -156,6 +171,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="(?i)^Oce (fx[^\s:]+):.*$">
     <description>Oce FX series multifunction device</description>
     <example os.product="fx3000">Oce fx3000:8C5-B29:Ver.D:U0707161719:B0601271355</example>
@@ -164,6 +180,7 @@
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="(?i)^Oce (VL\S+):.*$">
     <description>Oce VarioLink multifunction device</description>
     <example>Oce VL3200:8C5-D92:Ver.B</example>
@@ -172,16 +189,20 @@
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <!-- IGI is Imagistics International, which was acquired by Oce.
         I can't find MX-MBX3 or any variant online. -->
+
   <fingerprint pattern="(?i)^OceIGI MX-\S+">
     <description>Oce-acquired IGI printer</description>
     <example>OceIGI MX-NBX3 02-Jul-07 14:47</example>
     <param pos="0" name="os.vendor" value="Oce"/>
     <param pos="0" name="os.device" value="Printer"/>
   </fingerprint>
+
   <!-- im3510/4510 is actually a range of model numbers, but asserting a range
         of models as a product is preferableto asserting nothing. -->
+
   <fingerprint pattern="(?i)^Imagistics (im\S+) (.+)">
     <description>Oce IM series multifunction device</description>
     <example>Imagistics im3510/4510 02-Aug-04 10:56</example>
@@ -192,7 +213,9 @@
     <param pos="1" name="os.product"/>
     <param pos="2" name="system.time"/>
   </fingerprint>
+
   <!-- C610 is a series; there are several models with suffixes n, dn, dtn, cdn -->
+
   <fingerprint pattern="^OKI (C\d+)\S*$">
     <description>Okidata color printer</description>
     <example>OKI C610</example>
@@ -202,6 +225,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^OKI (MC\d+)\S*$">
     <description>Okidata multifunction device</description>
     <example>OKI MC860</example>
@@ -209,6 +233,7 @@
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="(?i)^RICOH ((?:Aficio|MP|SP) .*)$">
     <description>Ricoh Aficio Printer</description>
     <example>RICOH Aficio 2075</example>
@@ -220,8 +245,10 @@
     <param pos="1" name="os.product"/>
     <param pos="0" name="os.device" value="Printer"/>
   </fingerprint>
+
   <!-- NRG was acquired by Ricoh; classify NRG printers as such.
          Be consistent with snmp_sysdescr.xml. -->
+
   <fingerprint pattern="(?i)^NRG ([MS]P \S+)$">
     <description>Ricoh NRG printer</description>
     <example>NRG MP 171</example>
@@ -236,8 +263,10 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <!-- Gestetner == NRG, and was acquired by Ricoh.
          Assert the range of products as os.product. -->
+
   <fingerprint pattern="(?i)^Gestetner (MP\S+/DSc\S+)$">
     <description>Ricoh Gestetner multifunction device</description>
     <example>Gestetner MPC2500/DSc525</example>
@@ -245,6 +274,7 @@
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="(?i)^HYDRA$">
     <description>RSI Hydra printer</description>
     <example>HYDRA</example>
@@ -252,6 +282,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="0" name="os.product" value="Hydra"/>
   </fingerprint>
+
   <fingerprint pattern="(?i)^Savin (\S+)$">
     <description>Savin Printer</description>
     <example>SAVIN 4075</example>
@@ -259,6 +290,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="(?i)^Samsung ((?:SCX|CLX)-\S+) Series$">
     <description>Samsung multifunction device</description>
     <example>Samsung SCX-5835_5935 Series</example>
@@ -267,6 +299,7 @@
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="(?i)^Samsung ((?:ML|CLP)-\S+) Series$">
     <description>Samsung printer</description>
     <example>Samsung CLP-680 Series</example>
@@ -275,6 +308,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="(?i)^SHARP (\S+-\S+) .*$">
     <description>Sharp Printer</description>
     <example>Sharp MX-NBX3 18-Mar-08 10:22</example>
@@ -283,6 +317,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="(?i)^Source Technologies (\S+)$">
     <description>Source Technologies Printer</description>
     <example>Source Technologies ST-9620</example>
@@ -290,7 +325,9 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <!-- Consistent with snmp_sysdescr.xml -->
+
   <fingerprint pattern="^TOSHIBA (e-STUDIO\S+)(?:\s+.*)?" certainty="0.9">
     <description>Toshiba e-STUDIO multifunction device</description>
     <example>TOSHIBA e-STUDIO350 V468Z 20061013</example>
@@ -302,16 +339,16 @@
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <!-- TODO:
         Xerox AccXES devices are documented to return:
-
         "<printer name> <release #>"
         <FF>
-
         In the above, <printer name> is the official product name of the
         AccXES printer, and <release #> corresponds to a software release
         number.
      -->
+
   <fingerprint pattern="^(?:ID=)?Xerox (Phaser \S+)$" certainty="0.9">
     <description>Xerox Phaser Printer</description>
     <example>Xerox Phaser 6180MFP-D</example>
@@ -321,6 +358,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^Xerox (WorkCentre .*)$" certainty="0.9">
     <description>Xerox Workcentre Printer</description>
     <example>Xerox WorkCentre 7425</example>
@@ -331,6 +369,7 @@
     <param pos="1" name="os.product"/>
     <param pos="0" name="os.device" value="Printer"/>
   </fingerprint>
+
   <fingerprint pattern="^(XC\S+)$" certainty="0.9">
     <description>Xerox XC Printer</description>
     <example>XC560</example>
@@ -339,6 +378,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^(DC\S+)$" certainty="0.9">
     <description>Xerox DocuColor Printer</description>
     <example>DC250</example>
@@ -347,6 +387,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^(EX\d+-\d+)$" certainty="0.9">
     <description>Xerox EX Print Server, powered by EFI Fiery</description>
     <example>EX4112-4127</example>
@@ -355,4 +396,5 @@
     <param pos="0" name="os.device" value="Print server"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-</fingerprints>
+
+</fingerprints>

data/xml/html_title.xml

@@ -1,6 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <fingerprints matches="html_title" database_type="service" preference="0.90">
   <!-- HTML Title elements found in HTTP response bodies are matched against these patterns to fingerprint HTTP servers. -->
+
+  <fingerprint pattern="^301 Moved Permanently$">
+    <description>301 Moved Permanently - generic -- assert nothing.</description>
+    <example>301 Moved Permanently</example>
+  </fingerprint>
+
+  <fingerprint pattern="^400 Bad Request$">
+    <description>400 Bad Request - generic -- assert nothing.</description>
+    <example>400 Bad Request</example>
+  </fingerprint>
+
+  <fingerprint pattern="^401 Unauthorized$">
+    <description>401 Unauthorized - generic -- assert nothing.</description>
+    <example>401 Unauthorized</example>
+  </fingerprint>
+
+  <fingerprint pattern="^404 Not Found$">
+    <description>404 Not Found - generic -- assert nothing.</description>
+    <example>404 Not Found</example>
+  </fingerprint>
+
   <fingerprint pattern="^Index of /">
     <description>Apache HTTPD indexes</description>
     <example>Index of /</example>
@@ -9,6 +30,7 @@
     <param pos="0" name="service.family" value="Apache"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Test Page for the Nginx HTTP Server on (?:the )?Amazon Linux(?: AMI)?$">
     <description>Apache HTTPD default installation on Amazon Linux</description>
     <example>Test Page for the Nginx HTTP Server on the Amazon Linux AMI</example>
@@ -21,6 +43,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux AMI"/>
   </fingerprint>
+
   <fingerprint pattern="^Apache HTTP Server Test Page powered by CentOS$">
     <description>Apache HTTPD default installation on CentOS</description>
     <example>Apache HTTP Server Test Page powered by CentOS</example>
@@ -33,6 +56,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:centos:centos:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Apache2 Debian Default Page: It works$">
     <description>Apache HTTPD default installation on Debian</description>
     <example>Apache2 Debian Default Page: It works</example>
@@ -44,6 +68,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Apache2 Ubuntu Default Page: It works$">
     <description>Apache HTTPD default installation on Ubuntu</description>
     <example>Apache2 Ubuntu Default Page: It works</example>
@@ -55,6 +80,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Sample Home Page for APACHEDFT Server$">
     <description>IBM iSeries Apache Default Page</description>
     <example>Sample Home Page for APACHEDFT Server</example>
@@ -67,6 +93,7 @@
     <param pos="0" name="service.family" value="Apache"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Apache Tomcat$">
     <description>Apache Tomcat with no version</description>
     <example>Apache Tomcat</example>
@@ -75,6 +102,7 @@
     <param pos="0" name="service.family" value="Tomcat"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Apache Tomcat/(\S+)$">
     <description>Apache tomcat with minimal version information</description>
     <example service.version="8.0.32">Apache Tomcat/8.0.32</example>
@@ -84,13 +112,16 @@
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^AiCloud">
     <description>ASUS AiCloud</description>
     <example>AiCloud</example>
     <param pos="0" name="hw.vendor" value="Asus"/>
     <param pos="0" name="hw.device" value="WAP"/>
   </fingerprint>
+
   <!-- HiSilicon is OEMd by a number of DVR manufacturers -->
+
   <fingerprint pattern="^DVR Components Download$">
     <description>Web server found on DVR and webcam servers sourced from HiSilicon</description>
     <example>DVR Components Download</example>
@@ -100,6 +131,7 @@
     <param pos="0" name="os.device" value="DVR"/>
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
+
   <fingerprint pattern="^FRITZ!Box$">
     <description>AVM FRITZ!Box</description>
     <example>FRITZ!Box</example>
@@ -107,6 +139,7 @@
     <param pos="0" name="hw.device" value="WAP"/>
     <param pos="0" name="hw.family" value="FRITZ!Box"/>
   </fingerprint>
+
   <fingerprint pattern="^FRITZ!Powerline$">
     <description>AVM FRITZ!Powerline</description>
     <example>FRITZ!Powerline</example>
@@ -114,13 +147,16 @@
     <param pos="0" name="hw.device" value="Powerline"/>
     <param pos="0" name="hw.family" value="FRITZ!Powerline"/>
   </fingerprint>
-  <fingerprint pattern="^FRITZ!WLAN Repeater$">
+
+  <fingerprint pattern="^FRITZ!(?:WLAN )?Repeater$">
     <description>FRITZ!WLAN Repeater</description>
     <example>FRITZ!WLAN Repeater</example>
+    <example>FRITZ!Repeater</example>
     <param pos="0" name="hw.vendor" value="AVM"/>
     <param pos="0" name="hw.device" value="WLAN Repeater"/>
     <param pos="0" name="hw.family" value="FRITZ!WLAN Repeater"/>
   </fingerprint>
+
   <fingerprint pattern="^cPanel Login$">
     <description>cPanel</description>
     <example>cPanel Login</example>
@@ -128,6 +164,7 @@
     <param pos="0" name="service.product" value="cPanel"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:cpanel:cpanel:-"/>
   </fingerprint>
+
   <fingerprint pattern="^WHM Login$">
     <description>cPanel Web Host Manager</description>
     <example>WHM Login</example>
@@ -135,6 +172,7 @@
     <param pos="0" name="service.product" value="WHM"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:cpanel:whm:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Windows CE$">
     <description>Windows CE</description>
     <example>Windows CE</example>
@@ -143,6 +181,7 @@
     <param pos="0" name="os.product" value="Windows CE"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_ce:-"/>
   </fingerprint>
+
   <fingerprint pattern="^IIS7$">
     <description>Default IIS 7</description>
     <example>IIS7</example>
@@ -156,6 +195,7 @@
     <param pos="0" name="os.product" value="Windows"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Microsoft Internet Information Services 8">
     <description>Default IIS 8</description>
     <example>Microsoft Internet Information Services 8</example>
@@ -169,6 +209,7 @@
     <param pos="0" name="os.product" value="Windows"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
+
   <fingerprint pattern="^IIS (\d\.\d) Detailed Error">
     <description>IIS Detailed Error</description>
     <example service.version="7.0">IIS 7.0 Detailed Error - 401.2 - Unauthorized</example>
@@ -184,6 +225,7 @@
     <param pos="0" name="os.product" value="Windows"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
+
   <fingerprint pattern="^IIS Windows(?: Server)?$">
     <description>Default IIS</description>
     <example>IIS Windows</example>
@@ -197,6 +239,7 @@
     <param pos="0" name="os.product" value="Windows"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:NETIASPOT Management Console|Konsola zarzdzania NETIASPOT)$">
     <description>Netia Spot wireless router</description>
     <example>Konsola zarzdzania NETIASPOT</example>
@@ -205,6 +248,7 @@
     <param pos="0" name="hw.product" value="Spot"/>
     <param pos="0" name="hw.device" value="WAP"/>
   </fingerprint>
+
   <fingerprint pattern="^hue personal wireless lighting$">
     <description>Philips Hue Personal Wireless Lighting</description>
     <example>hue personal wireless lighting</example>
@@ -212,12 +256,15 @@
     <param pos="0" name="hw.product" value="Hue"/>
     <param pos="0" name="hw.device" value="Light Bulb"/>
   </fingerprint>
+
   <fingerprint pattern="LANDesk\(R\) Management Agent$">
     <description>LANDesk Management Agent</description>
+    <example>LANDesk(R) Management Agent</example>
     <param pos="0" name="service.vendor" value="LANDesk"/>
     <param pos="0" name="service.product" value="Management Agent"/>
     <param pos="0" name="service.family" value="Management Agent"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:Parallels )?Plesk (?:(?:Onyx|Panel) )?([\d\.]+)$">
     <description>Plesk web hosting platform with a version</description>
     <example service.version="12.0.18">Plesk 12.0.18</example>
@@ -229,6 +276,7 @@
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:parallels:parallels_plesk_panel:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:Parallels )?Plesk (?:(?:Onyx|Panel) )?([\d\.]+) for Microsoft Windows$">
     <description>Plesk web hosting platform with a version on Windows</description>
     <example service.version="12.5.30">Plesk 12.5.30 for Microsoft Windows</example>
@@ -242,6 +290,7 @@
     <param pos="0" name="os.product" value="Windows"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i)Default (?:Parallels )?Plesk (?:Panel )?Page$">
     <description>Plesk web hosting platform with no version</description>
     <example>Default Parallels Plesk Panel Page</example>
@@ -251,12 +300,14 @@
     <param pos="0" name="service.product" value="Plesk"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:parallels:parallels_plesk_panel:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Web Viewer for Samsung DVR$">
     <description>Samsung DVRs</description>
     <example>Web Viewer for Samsung DVR</example>
     <param pos="0" name="hw.vendor" value="Samsung"/>
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i)(?:Dell )?Sonicwall - Authentication$">
     <description>Sonicwall firewalls</description>
     <example>SonicWall - Authentication</example>
@@ -264,6 +315,7 @@
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.family" value="SonicOS"/>
   </fingerprint>
+
   <fingerprint pattern="^(.*).nbsp;-.nbsp;Synology.nbsp;DiskStation$">
     <description>Synology DiskStation</description>
     <example host.name="DiskStation">DiskStation&amp;nbsp;-&amp;nbsp;Synology&amp;nbsp;DiskStation</example>
@@ -277,6 +329,7 @@
     <param pos="0" name="os.vendor" value="Synology"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
+
   <fingerprint pattern="Synology Web Station!$">
     <description>Synology with WebStation web hosting</description>
     <example>Hello! Welcome to Synology Web Station!</example>
@@ -289,6 +342,7 @@
     <param pos="0" name="os.product" value="DSM"/>
     <param pos="0" name="os.vendor" value="Synology"/>
   </fingerprint>
+
   <fingerprint pattern="^Web Filter Block Override$">
     <description>Fortinet FortiGate/Fortiguard Web Filter</description>
     <example>Web Filter Block Override</example>
@@ -301,12 +355,15 @@
     <param pos="0" name="hw.family" value="FortiGate"/>
     <param pos="0" name="hw.device" value="Firewall"/>
   </fingerprint>
+
   <!-- Various products by Ubiquiti networks -->
+
   <fingerprint pattern="^Ubiquiti Networks$">
     <description>Generic products by Ubiquiti Networks</description>
     <example>Ubiquiti Networks</example>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
   </fingerprint>
+
   <fingerprint pattern="^UniFi Security Gateway$">
     <description>Ubiquiti Security Gateway</description>
     <example>UniFi Security Gateway</example>
@@ -314,17 +371,34 @@
     <param pos="0" name="hw.device" value="Router"/>
     <param pos="0" name="hw.product" value="UniFi Security Gateway"/>
   </fingerprint>
+
+  <fingerprint pattern="^Ubiquiti EdgeSwitch$">
+    <description>Ubiquiti EdgeSwitch</description>
+    <example>Ubiquiti EdgeSwitch</example>
+    <param pos="0" name="os.vendor" value="Ubiquiti"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="EdgeOS"/>
+    <param pos="0" name="hw.vendor" value="Ubiquiti"/>
+    <param pos="0" name="hw.product" value="EdgeSwitch"/>
+  </fingerprint>
+
   <fingerprint pattern="^EdgeOS$">
     <description>Ubiquiti EdgeRouter/EdgeSwitch/etc</description>
     <example>EdgeOS</example>
+    <param pos="0" name="os.vendor" value="Ubiquiti"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="EdgeOS"/>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
   </fingerprint>
-  <fingerprint pattern="^CloudKey$">
+
+  <fingerprint pattern="^Cloud\s*Key$">
     <description>Ubiquiti UniFi Cloud Key</description>
     <example>CloudKey</example>
+    <example>Cloud Key</example>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
     <param pos="0" name="hw.product" value="UniFi Cloud Key"/>
   </fingerprint>
+
   <fingerprint pattern="^airCube$">
     <description>Ubiquiti airCube WAP</description>
     <example>airCube</example>
@@ -332,6 +406,7 @@
     <param pos="0" name="hw.product" value="airCube"/>
     <param pos="0" name="hw.device" value="WAP"/>
   </fingerprint>
+
   <fingerprint pattern="^UniFi Video$">
     <description>Various UniFi Video web service</description>
     <example>UniFi Video</example>
@@ -339,14 +414,17 @@
     <param pos="0" name="service.product" value="UniFi Video"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:ui:unifi_video:-"/>
   </fingerprint>
-  <fingerprint pattern="^UniFi NVR: Software Portal$">
+
+  <fingerprint pattern="^(?:UniFi NVR: Software Portal|airVision: \[NVR\] - Software Portal)$">
     <description>UniFi NVR for recording from UniFi video cameras</description>
     <example>UniFi NVR: Software Portal</example>
+    <example>airVision: [NVR] - Software Portal</example>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
     <param pos="0" name="hw.family" value="UniFi"/>
     <param pos="0" name="hw.product" value="UniFi NVR"/>
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
+
   <fingerprint pattern="^RomPager Embedded Web Server Toolkit$">
     <description>Embedded HTTP server used by many vendors and device
       types, including APC, 3Com, Andover Controls, Cisco VoIP, D-Link,
@@ -357,6 +435,7 @@
     <param pos="0" name="service.vendor" value="Allegro Software"/>
     <param pos="0" name="service.product" value="RomPager"/>
   </fingerprint>
+
   <fingerprint pattern="^RouterOS router configuration page$">
     <description>MikroTik RouterOS router configuration page</description>
     <example>RouterOS router configuration page</example>
@@ -367,6 +446,7 @@
     <param pos="0" name="hw.vendor" value="MikroTik"/>
     <param pos="0" name="hw.device" value="Router"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:Welcome to nginx!|Test Page for the Nginx HTTP Server)$">
     <description>Default OS-agnostic nginx</description>
     <example>Welcome to nginx!</example>
@@ -376,6 +456,7 @@
     <param pos="0" name="service.vendor" value="nginx"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:nginx:nginx:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Test Page for the Nginx HTTP Server on (?:Fedora|EPEL)$">
     <description>Default nginx on Fedora</description>
     <example>Test Page for the Nginx HTTP Server on Fedora</example>
@@ -388,6 +469,7 @@
     <param pos="0" name="os.product" value="Fedora Core Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:fedora_core:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Welcome to nginx on Debian!$">
     <description>Default nginx on Debian</description>
     <example>Welcome to nginx on Debian!</example>
@@ -399,19 +481,34 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Eagle Eye Networks ">
     <description>Eagle Eye Networks to manage IoT cameras home webpage</description>
     <example>Eagle Eye Networks (Local)</example>
     <param pos="0" name="hw.product" value="Bridge"/>
     <param pos="0" name="hw.vendor" value="Eagle Eye Networks"/>
   </fingerprint>
+
   <fingerprint pattern="^Web Local Display Unauthorized$">
     <description>Eagle Eye Networks to manage IoT cameras unauthorized webpage</description>
     <example>Web Local Display Unauthorized</example>
-    <param pos="0" name="hw.product" value=" Bridge"/>
+    <param pos="0" name="hw.product" value="Bridge"/>
     <param pos="0" name="hw.vendor" value="Eagle Eye Networks"/>
   </fingerprint>
+
   <!-- Netgear Products -->
+
+  <fingerprint pattern="^NETGEAR ReadyNAS$">
+    <description>NETGEAR ReadyNAS</description>
+    <example>NETGEAR ReadyNAS</example>
+    <param pos="0" name="os.vendor" value="Netgear"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="hw.vendor" value="Netgear"/>
+    <param pos="0" name="hw.device" value="NAS"/>
+    <param pos="0" name="hw.family" value="ReadyNAS"/>
+    <param pos="0" name="hw.product" value="ReadyNAS"/>
+  </fingerprint>
+
   <fingerprint pattern="^(?:NETGEAR|NetGear) ([a-zA-Z0-9\-\+]+)$">
     <description>Netgear Switches</description>
     <example hw.product="GS108T">NETGEAR GS108T</example>
@@ -421,6 +518,7 @@
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:NETGEAR|NetGear) Router ([a-zA-Z0-9\-\+]+)$">
     <description>Netgear Routers</description>
     <example hw.product="WNR2000v4">NETGEAR Router WNR2000v4</example>
@@ -429,6 +527,7 @@
     <param pos="0" name="hw.device" value="Router"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+
   <fingerprint pattern="^Netgear Prosafe Plus Switch$">
     <description>Netgear Prosafe Plus Switch</description>
     <example>Netgear Prosafe Plus Switch</example>
@@ -436,6 +535,7 @@
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="0" name="hw.product" value="Prosafe Plus"/>
   </fingerprint>
+
   <fingerprint pattern="^(.*).nbsp;Configuration and Management$">
     <description>Digi Terminal Servers</description>
     <example hw.product="Digi One SP">Digi One SP&amp;nbsp;Configuration and Management</example>
@@ -448,6 +548,7 @@
     <param pos="0" name="os.device" value="Device Server"/>
     <param pos="0" name="os.product" value="NET+OS"/>
   </fingerprint>
+
   <fingerprint pattern="^NPort Web Console$">
     <description>Moxa NPort Terminal Servers</description>
     <example>NPort Web Console</example>
@@ -455,6 +556,7 @@
     <param pos="0" name="hw.device" value="Device Server"/>
     <param pos="0" name="hw.product" value="NPort"/>
   </fingerprint>
+
   <fingerprint pattern="^Lantronix (SL[BC].*)$">
     <description>Lantronix terminal server</description>
     <example hw.product="SLB882/8824">Lantronix SLB882/8824</example>
@@ -464,6 +566,7 @@
     <param pos="0" name="hw.device" value="Device Server"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+
   <fingerprint pattern="^(KN\S+) - Cover$">
     <description>ATEN KVM over IP</description>
     <example hw.product="KN4140v">KN4140v - Cover</example>
@@ -472,6 +575,7 @@
     <param pos="0" name="hw.device" value="KVM"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+
   <fingerprint pattern="^Ethernet Relay Module$">
     <description>AVT.pl Ethernet Relay Module</description>
     <example>Ethernet Relay Module</example>
@@ -479,6 +583,7 @@
     <param pos="0" name="hw.device" value="Power Relay"/>
     <param pos="0" name="hw.product" value="Ethernet Relay Module"/>
   </fingerprint>
+
   <fingerprint pattern="^Inveo Lantick Ethernet Relay Controller$">
     <description>Inveo Lantick Ethernet Relay Controller</description>
     <example>Inveo Lantick Ethernet Relay Controller</example>
@@ -486,6 +591,7 @@
     <param pos="0" name="hw.device" value="Power Relay"/>
     <param pos="0" name="hw.product" value="Lantick Ethernet Relay Controller"/>
   </fingerprint>
+
   <fingerprint pattern="^(myUTN(?:-[a-zA-Z0-9]+)?) Control Center$">
     <description>myUTN Device Server</description>
     <example hw.product="myUTN-50a">myUTN-50a Control Center</example>
@@ -494,6 +600,7 @@
     <param pos="0" name="hw.device" value="Device Server"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+
   <fingerprint pattern="^iCOM Control Board$">
     <description>Liebert iCOM Cooling Unit Control Board</description>
     <example>iCOM Control Board</example>
@@ -501,6 +608,7 @@
     <param pos="0" name="hw.device" value="Environment Control"/>
     <param pos="0" name="hw.product" value="iCOM Control Panel"/>
   </fingerprint>
+
   <fingerprint pattern="^Sigma Control 2$">
     <description>Sigma Control 2 Air Compressor Controls</description>
     <example>Sigma Control 2</example>
@@ -508,12 +616,14 @@
     <param pos="0" name="hw.device" value="Environment Control"/>
     <param pos="0" name="hw.product" value="Sigma Control 2"/>
   </fingerprint>
+
   <fingerprint pattern="^WebPower$">
     <description>Eltek Power Controller</description>
     <example>WebPower</example>
     <param pos="0" name="hw.vendor" value="Eltek"/>
     <param pos="0" name="hw.device" value="Power device"/>
   </fingerprint>
+
   <fingerprint pattern="(Expert Power Control NET \d+x\d+) - (.*)$">
     <description>Gude Expert Power Control</description>
     <example host.name="Rack42" hw.product="Expert Power Control NET 2x6">Expert Power Control NET 2x6 - Rack42</example>
@@ -522,6 +632,7 @@
     <param pos="1" name="hw.product"/>
     <param pos="2" name="host.name"/>
   </fingerprint>
+
   <fingerprint pattern="^Sentry Switched CDU$">
     <description>Sentry Switched CDU</description>
     <example>Sentry Switched CDU</example>
@@ -529,6 +640,7 @@
     <param pos="0" name="hw.device" value="Power device"/>
     <param pos="0" name="hw.product" value="Sentry Switched CDU"/>
   </fingerprint>
+
   <fingerprint pattern="^Emerson Network Power Rack PDU Card$">
     <description>Emerson Network Power Rack PDU Card</description>
     <example>Emerson Network Power Rack PDU Card</example>
@@ -536,6 +648,7 @@
     <param pos="0" name="hw.device" value="Power device"/>
     <param pos="0" name="hw.product" value="Rack PDU Card"/>
   </fingerprint>
+
   <fingerprint pattern="^(.*) IntelliSlot Web(?:/\d+)? Card?$">
     <description>Emerson Network Power IntelliSlot Web Card and rebrands</description>
     <example hw.vendor="Emerson Network Power">Emerson Network Power IntelliSlot Web Card</example>
@@ -546,6 +659,7 @@
     <param pos="0" name="hw.device" value="Power device"/>
     <param pos="0" name="hw.product" value="IntelliSlot Web Card"/>
   </fingerprint>
+
   <fingerprint pattern="^ConnectUPS Web/SNMP Card$">
     <description>ConnectUPS Web/SNMP Card</description>
     <example>ConnectUPS Web/SNMP Card</example>
@@ -553,6 +667,7 @@
     <param pos="0" name="hw.device" value="Power device"/>
     <param pos="0" name="hw.product" value="ConnectUPS Web Card"/>
   </fingerprint>
+
   <fingerprint pattern="^Calient Technologies Inc\.$">
     <description>Calient Photonic Switch</description>
     <example>Calient Technologies Inc.</example>
@@ -563,6 +678,7 @@
     <param pos="0" name="os.device" value="Switch"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^Google Fiber Network Box Diagnostics$">
     <description>Google Fiber Router</description>
     <example>Google Fiber Network Box Diagnostics</example>
@@ -570,6 +686,7 @@
     <param pos="0" name="hw.device" value="Router"/>
     <param pos="0" name="hw.product" value="Fiber Network Box"/>
   </fingerprint>
+
   <fingerprint pattern="ServerView.* (iRMC S\d+) Web Server">
     <description>Fujitsu iRMC BMC</description>
     <example hw.product="iRMC S3" os.product="iRMC S3">ServerView Remote Management iRMC S3 Web Server</example>
@@ -581,9 +698,11 @@
     <param pos="0" name="os.vendor" value="Fujitsu"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="^Cisco UCS KVM Direct$">
-    <description>Cisco UCS KVM Direct</description>
+
+  <fingerprint pattern="^Cisco (?:UCS KVM Direct|KVM)$">
+    <description>Cisco KVM</description>
     <example>Cisco UCS KVM Direct</example>
+    <example>Cisco KVM</example>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.device" value="Lights Out Management"/>
     <param pos="0" name="hw.product" value="UCS Manager"/>
@@ -593,6 +712,7 @@
     <param pos="0" name="os.certainty" value="0.8"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:cisco:nx-os:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Cisco UCS Manager$">
     <description>Cisco UCS Manager</description>
     <example>Cisco UCS Manager</example>
@@ -605,6 +725,7 @@
     <param pos="0" name="os.certainty" value="0.8"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:cisco:nx-os:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Cisco (?:IMC Login|Integrated Management Controller)">
     <description>Cisco Integrated Management Controller</description>
     <example>Cisco Integrated Management Controller</example>
@@ -618,6 +739,26 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="IMC"/>
   </fingerprint>
+
+  <fingerprint pattern="^Cisco Meeting Management$">
+    <description>Cisco Meeting Management Virtual Appliance</description>
+    <example>Cisco Meeting Management</example>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="Video Conferencing"/>
+    <param pos="0" name="hw.product" value="Meeting Management"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Meeting Management"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Cisco SON$">
+    <description>Cisco Crosswork SON</description>
+    <example>Cisco SON</example>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
+    <param pos="0" name="hw.product" value="Crosswork SON Appliance"/>
+  </fingerprint>
+
   <fingerprint pattern="^HPE Virtual Connect Manager$">
     <description>HPE Virtual Connect Manager</description>
     <example>HPE Virtual Connect Manager</example>
@@ -628,6 +769,7 @@
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="0" name="os.product" value="iLO"/>
   </fingerprint>
+
   <fingerprint pattern="^HPE BladeSystem Onboard Administrator$">
     <description>HPE BladeSystem Onboard Administrator</description>
     <example>HPE BladeSystem Onboard Administrator</example>
@@ -635,6 +777,7 @@
     <param pos="0" name="hw.vendor" value="HPE"/>
     <param pos="0" name="hw.product" value="BladeSystem Onboard Administrator"/>
   </fingerprint>
+
   <fingerprint pattern="^HPE System Management Homepage$">
     <description>HPE System Management Homepage</description>
     <example>HPE System Management Homepage</example>
@@ -645,6 +788,7 @@
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="0" name="os.product" value="iLO"/>
   </fingerprint>
+
   <fingerprint pattern="^HP Integrated Lights-Out$">
     <description>HP Integrated Lights-Out</description>
     <example>HP Integrated Lights-Out</example>
@@ -657,6 +801,7 @@
     <param pos="0" name="os.family" value="iLO"/>
     <param pos="0" name="os.product" value="iLO"/>
   </fingerprint>
+
   <fingerprint pattern="^HP Integrated Lights-Out 2$">
     <description>HP Integrated Lights-Out 2</description>
     <example>HP Integrated Lights-Out 2</example>
@@ -669,6 +814,7 @@
     <param pos="0" name="os.family" value="iLO"/>
     <param pos="0" name="os.product" value="iLO 2"/>
   </fingerprint>
+
   <fingerprint pattern="^(iLO \d+)$">
     <description>HP Integrated Lights-Out 3+</description>
     <example hw.product="iLO 3" os.product="iLO 3">iLO 3</example>
@@ -681,6 +827,7 @@
     <param pos="0" name="os.family" value="iLO"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^HPE SimpliVity OmniStack$">
     <description>HPE SimpliVity OmniStack</description>
     <example>HPE SimpliVity OmniStack</example>
@@ -688,6 +835,7 @@
     <param pos="0" name="hw.vendor" value="HPE"/>
     <param pos="0" name="hw.product" value="SimpliVity OmniStack"/>
   </fingerprint>
+
   <fingerprint pattern="^HPE (StoreEver \S+)$">
     <description>HPE StoreEver</description>
     <example hw.product="StoreEver MSL3040">HPE StoreEver MSL3040</example>
@@ -695,6 +843,7 @@
     <param pos="0" name="hw.vendor" value="HPE"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+
   <fingerprint pattern="^Dell OpenManage Switch Administrator$">
     <description>Dell OpenManage Switch Administrator</description>
     <example>Dell OpenManage Switch Administrator</example>
@@ -702,6 +851,7 @@
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="0" name="hw.product" value="OpenManage Switch"/>
   </fingerprint>
+
   <fingerprint pattern="^(\S+)\s+-\s+ProCurve Switch (\S+) \((.*)\)$">
     <description>HPE ProCurve Switch w/Hostname</description>
     <example host.name="SW1" hw.product="4204vl" procurve.model="J8770A">SW1 - ProCurve Switch 4204vl (J8770A)</example>
@@ -711,6 +861,7 @@
     <param pos="1" name="host.name"/>
     <param pos="3" name="procurve.model"/>
   </fingerprint>
+
   <fingerprint pattern="^ProCurve Switch (\S+) \((.*)\)$">
     <description>HPE ProCurve Switch w/o Hostname</description>
     <example hw.product="2610-24/12PWR" procurve.model="J9086A">ProCurve Switch 2610-24/12PWR (J9086A)</example>
@@ -719,6 +870,7 @@
     <param pos="1" name="hw.product"/>
     <param pos="2" name="procurve.model"/>
   </fingerprint>
+
   <fingerprint pattern="^FlexiPacket Hub$">
     <description>Nokia Siemens FlexiPacket Hub</description>
     <example>FlexiPacket Hub</example>
@@ -726,6 +878,7 @@
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="0" name="hw.product" value="FlexiPacket Hub"/>
   </fingerprint>
+
   <fingerprint pattern="^R&amp;S Instrument VNC desktop$">
     <description>Rohde and Schwarz Remote Instrument (vnc)</description>
     <example>R&amp;S Instrument VNC desktop</example>
@@ -735,12 +888,14 @@
     <param pos="0" name="os.vendor" value="Rohde &amp; Schwarz"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^Rohde &amp; Schwarz remote instrument$">
     <description>Rohde and Schwarz Remote Instrument (web admin)</description>
     <example>Rohde &amp; Schwarz remote instrument</example>
     <param pos="0" name="hw.device" value="Test Instrument"/>
     <param pos="0" name="hw.vendor" value="Rohde &amp; Schwarz"/>
   </fingerprint>
+
   <fingerprint pattern="^EXA$">
     <description>Keysight EXA Signal Analyzer</description>
     <example>EXA</example>
@@ -749,6 +904,7 @@
     <param pos="0" name="hw.product" value="EXA Signal Analyzer"/>
     <param pos="0" name="os.device" value="Test Instrument"/>
   </fingerprint>
+
   <fingerprint pattern="^MXA$">
     <description>Keysight MXA Signal Analyzer</description>
     <example>MXA</example>
@@ -757,6 +913,7 @@
     <param pos="0" name="hw.product" value="MXA Signal Analyzer"/>
     <param pos="0" name="os.device" value="Test Instrument"/>
   </fingerprint>
+
   <fingerprint pattern="^Paragon-100G$">
     <description>Calnex Paragon-100G</description>
     <example>Paragon-100G</example>
@@ -764,6 +921,7 @@
     <param pos="0" name="hw.device" value="Test Instrument"/>
     <param pos="0" name="hw.product" value="Paragon-100G"/>
   </fingerprint>
+
   <fingerprint pattern="^33521A$">
     <description>Keysight 33521A Waveform Generator</description>
     <example>33521A</example>
@@ -771,6 +929,7 @@
     <param pos="0" name="hw.device" value="Test Instrument"/>
     <param pos="0" name="hw.product" value="33521A Waveform Generator"/>
   </fingerprint>
+
   <fingerprint pattern="^34972A$">
     <description>Keysight 34972A Data Logger</description>
     <example>34972A</example>
@@ -778,6 +937,7 @@
     <param pos="0" name="hw.device" value="Test Instrument"/>
     <param pos="0" name="hw.product" value="34972A Data Logger"/>
   </fingerprint>
+
   <fingerprint pattern="^53230A$">
     <description>Agilent 53230A Frequency Counter</description>
     <example>53230A</example>
@@ -785,6 +945,7 @@
     <param pos="0" name="hw.device" value="Test Instrument"/>
     <param pos="0" name="hw.product" value="53230A Frequency Counter"/>
   </fingerprint>
+
   <fingerprint pattern="^Agilent 33220A \((.*)\)$">
     <description>Agilent 33220A</description>
     <example agilent.serial="MY44041111">Agilent 33220A (MY44041111)</example>
@@ -793,6 +954,7 @@
     <param pos="0" name="hw.product" value="33220A Waveform Generator"/>
     <param pos="1" name="agilent.serial"/>
   </fingerprint>
+
   <fingerprint pattern="^Agilent N5172B (?:EXG )?(MY\S+)$">
     <description>Agilent N5172B</description>
     <example agilent.serial="MY44041111">Agilent N5172B EXG MY44041111</example>
@@ -801,6 +963,7 @@
     <param pos="0" name="hw.product" value="N5172B Signal Generator"/>
     <param pos="1" name="agilent.serial"/>
   </fingerprint>
+
   <fingerprint pattern="^Polycom - Configuration Utility$">
     <description>Polycom IP Phone</description>
     <example>Polycom - Configuration Utility</example>
@@ -810,12 +973,14 @@
     <param pos="0" name="os.vendor" value="Polycom"/>
     <param pos="0" name="os.product" value="Polycom"/>
   </fingerprint>
+
   <fingerprint pattern="^Digium Phone Settings$">
     <description>Digium Phone Settings</description>
     <example>Digium Phone Settings</example>
     <param pos="0" name="hw.vendor" value="Digium"/>
     <param pos="0" name="hw.device" value="VoIP"/>
   </fingerprint>
+
   <fingerprint pattern="^(SPA\S+) Configuration Utility$">
     <description>Cisco IP Phone - SPA504G Configuration Utility</description>
     <example hw.product="SPA504G">SPA504G Configuration Utility</example>
@@ -823,6 +988,7 @@
     <param pos="0" name="hw.device" value="VoIP"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+
   <fingerprint pattern="^Cisco (?:SPA Configuration|IP Phone)$">
     <description>Cisco IP Phone </description>
     <example>Cisco SPA Configuration</example>
@@ -830,12 +996,14 @@
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.device" value="VoIP"/>
   </fingerprint>
+
   <fingerprint pattern="^Cisco IP Camera$">
     <description>Cisco IP Camera</description>
     <example>Cisco IP Camera</example>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.device" value="Web cam"/>
   </fingerprint>
+
   <fingerprint pattern="^Cisco TelePresence MCU">
     <description>Cisco TelePresence MCU - Home page</description>
     <example>Cisco TelePresence MCU - Home page</example>
@@ -844,6 +1012,7 @@
     <param pos="0" name="hw.device" value="Video Conferencing"/>
     <param pos="0" name="hw.product" value="TelePresence MCU"/>
   </fingerprint>
+
   <fingerprint pattern="^Cisco (Nexus \d+\S+)$">
     <description>Cisco Nexus Virtual Switch</description>
     <example hw.product="Nexus 1000V">Cisco Nexus 1000V</example>
@@ -851,6 +1020,7 @@
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+
   <fingerprint pattern="^Cisco Catalyst Switch - Home$">
     <description>Cisco Catalyst Switch</description>
     <example>Cisco Catalyst Switch - Home</example>
@@ -861,6 +1031,7 @@
     <param pos="0" name="os.product" value="CatOS"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:cisco:catos:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Cisco MDS 9000(?: and Nexus 5000)? Management Modules (\d+\.\d+\S+)$">
     <description>Cisco MDS 9000/Nexus 5000</description>
     <example os.version="7.3(1)D1(1)">Cisco MDS 9000 and Nexus 5000 Management Modules 7.3(1)D1(1)</example>
@@ -876,6 +1047,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:cisco:mds_9000:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^Stealthwatch Management Console$">
     <description>Stealthwatch Management Console</description>
     <example>Stealthwatch Management Console</example>
@@ -886,6 +1058,7 @@
     <param pos="0" name="os.device" value="Security Appliance"/>
     <param pos="0" name="os.product" value="Stealthwatch"/>
   </fingerprint>
+
   <fingerprint pattern="^Cisco vManage$">
     <description>Cisco vManage SD-WAN</description>
     <example>Cisco vManage</example>
@@ -896,6 +1069,7 @@
     <param pos="0" name="os.device" value="SD-WAN Appliance"/>
     <param pos="0" name="os.product" value="vManage"/>
   </fingerprint>
+
   <fingerprint pattern="^Login - Cisco DNA Center$">
     <description>Cisco DNA Center Appliance</description>
     <example>Login - Cisco DNA Center</example>
@@ -906,6 +1080,7 @@
     <param pos="0" name="os.device" value="Network Management Device"/>
     <param pos="0" name="os.product" value="DNA Center"/>
   </fingerprint>
+
   <fingerprint pattern="^Cisco (?:Enterprise )?NFVIS$">
     <description>Cisco NFVIS</description>
     <example>Cisco NFVIS</example>
@@ -917,16 +1092,20 @@
     <param pos="0" name="os.device" value="Network Management Device"/>
     <param pos="0" name="os.product" value="NFVIS"/>
   </fingerprint>
+
   <fingerprint pattern="^Cisco Systems Login$">
     <description>Cisco WLC</description>
     <example>Cisco Systems Login</example>
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.device" value="Wireless Controller"/>
     <param pos="0" name="os.product" value="Wireless LAN Controller"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:wireless_lan_controller:-"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.device" value="Wireless Controller"/>
     <param pos="0" name="hw.product" value="Wireless LAN Controller"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:wireless_lan_controller:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Duo Access Gateway$">
     <description>Duo Access Gateway</description>
     <example>Duo Access Gateway</example>
@@ -937,6 +1116,7 @@
     <param pos="0" name="os.device" value="Security Appliance"/>
     <param pos="0" name="os.product" value="Access Gateway"/>
   </fingerprint>
+
   <fingerprint pattern="^Login - Duo Network Gateway$">
     <description>Duo Network Gateway</description>
     <example>Login - Duo Network Gateway</example>
@@ -947,6 +1127,7 @@
     <param pos="0" name="os.device" value="Security Appliance"/>
     <param pos="0" name="os.product" value="Network Gateway"/>
   </fingerprint>
+
   <fingerprint pattern="^VBrick Rev">
     <description>VBrick Rev</description>
     <example>VBrick Rev</example>
@@ -957,6 +1138,7 @@
     <param pos="0" name="os.device" value="Video Conferencing"/>
     <param pos="0" name="os.product" value="VBrick Rev"/>
   </fingerprint>
+
   <fingerprint pattern="^(LinxVII-\S+) Remote Access$">
     <description>LinxVII-5S Data Terminal</description>
     <example hw.product="LinxVII-5S">LinxVII-5S Remote Access</example>
@@ -964,12 +1146,14 @@
     <param pos="0" name="hw.device" value="Data Terminal"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+
   <fingerprint pattern="^Datalogic Mobile Portable$">
     <description>Datalogic Mobile Portable</description>
     <example>Datalogic Mobile Portable</example>
     <param pos="0" name="hw.vendor" value="Datalogic Mobile"/>
     <param pos="0" name="hw.device" value="Handheld Scanner"/>
   </fingerprint>
+
   <fingerprint pattern="^AXIS$">
     <description>Axis Communications Web Cam</description>
     <example>AXIS</example>
@@ -979,6 +1163,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.device" value="Web cam"/>
   </fingerprint>
+
   <fingerprint pattern="^Hanwha Techwin$">
     <description>Hanwha Techwin IP Camera</description>
     <example>Hanwha Techwin</example>
@@ -988,6 +1173,7 @@
     <param pos="0" name="os.device" value="Web cam"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(WV-NS\S+) Network Camera$">
     <description>WV-NS202A Network Camera</description>
     <example hw.product="WV-NS202A">WV-NS202A Network Camera</example>
@@ -999,15 +1185,29 @@
     <param pos="0" name="os.device" value="Web cam"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
-  <fingerprint pattern="^KACE Systems Management Appliance">
+
+  <fingerprint pattern="^KACE (?:Systems Management|Systems Deployment|Remote Site) Appliance">
     <description>KACE Systems Management Appliances</description>
     <example>KACE Systems Management Appliance Service Center</example>
     <example>KACE Systems Management Appliance Administrator Console</example>
+    <example>KACE Systems Deployment Appliance</example>
+    <example>KACE Remote Site Appliance</example>
     <param pos="0" name="hw.vendor" value="KACE"/>
     <param pos="0" name="hw.device" value="Support Appliance"/>
     <param pos="0" name="os.vendor" value="KACE"/>
     <param pos="0" name="os.family" value="FreeBSD"/>
   </fingerprint>
+
+  <fingerprint pattern="^K1000 Service Center$">
+    <description>Dell K1000 Systems Management Appliances (KACE)</description>
+    <example>K1000 Service Center</example>
+    <param pos="0" name="hw.vendor" value="KACE"/>
+    <param pos="0" name="hw.device" value="Support Appliance"/>
+    <param pos="0" name="hw.product" value="K1000"/>
+    <param pos="0" name="os.vendor" value="KACE"/>
+    <param pos="0" name="os.family" value="FreeBSD"/>
+  </fingerprint>
+
   <fingerprint pattern="Portal.*Powered by BOMGAR$">
     <description>Bomgar Appliances</description>
     <example>Remote Support Portal | Powered by BOMGAR</example>
@@ -1017,6 +1217,7 @@
     <param pos="0" name="os.vendor" value="Bomgar"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^XRoads Network Appliance Administration$">
     <description>XRoads SD-WAN Network Appliance </description>
     <example>XRoads Network Appliance Administration</example>
@@ -1025,7 +1226,9 @@
     <param pos="0" name="os.vendor" value="XRoads"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
+
   <!-- An OEM of the Quantum Corporation SuperLoader 3 -->
+
   <fingerprint pattern="^On Board Remote Management$">
     <description>PowerVault 124T Tape Library</description>
     <example>On Board Remote Management</example>
@@ -1034,6 +1237,7 @@
     <param pos="0" name="hw.product" value="PowerVault 124T"/>
     <param pos="0" name="os.vendor" value="Dell"/>
   </fingerprint>
+
   <fingerprint pattern="^(HD-RX-\S+)$">
     <description>Crestron Multiformat Receivers</description>
     <example hw.product="HD-RX-201-C-E">HD-RX-201-C-E</example>
@@ -1042,6 +1246,7 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Crestron"/>
   </fingerprint>
+
   <fingerprint pattern="^Lencore Sound Manager 2$">
     <description>Lencore Sound Manager 2</description>
     <example>Lencore Sound Manager 2</example>
@@ -1051,7 +1256,9 @@
     <param pos="0" name="os.vendor" value="i.LON"/>
     <param pos="0" name="os.product" value="SmartServer"/>
   </fingerprint>
+
   <!-- Various ICS/OT -->
+
   <fingerprint pattern="^CTI (25\S+) Main Menu$">
     <description>Siemens 257x Ethernet Adapter (CTI Branded)</description>
     <example hw.product="2572-A">CTI 2572-A Main Menu</example>
@@ -1060,6 +1267,7 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Siemens"/>
   </fingerprint>
+
   <fingerprint pattern="^(25\S+) Ethernet TCP/IP Module$">
     <description>Siemens 257x Ethernet Adapter</description>
     <example hw.product="2572-B">2572-B Ethernet TCP/IP Module</example>
@@ -1068,6 +1276,7 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Siemens"/>
   </fingerprint>
+
   <fingerprint pattern="^ECOM100 Main$">
     <description>DirectLOGIC DL205 communication module</description>
     <example>ECOM100 Main</example>
@@ -1076,6 +1285,7 @@
     <param pos="0" name="hw.product" value="ECOM100"/>
     <param pos="0" name="os.vendor" value="DirectLOGIC"/>
   </fingerprint>
+
   <fingerprint pattern="^(1794-\S+) FLEX Ethernet Adapter$">
     <description>Allen-Bradley 1794-AENTR FLEX Ethernet Adapter</description>
     <example hw.product="1794-AENTR">1794-AENTR FLEX Ethernet Adapter</example>
@@ -1084,6 +1294,7 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Allen-Bradley"/>
   </fingerprint>
+
   <fingerprint pattern="^Anybus-CC EtherNet/IP$">
     <description>Anybus-CC EtherNet/IP</description>
     <example>Anybus-CC EtherNet/IP</example>
@@ -1092,6 +1303,7 @@
     <param pos="0" name="hw.product" value="CC EtherNet/IP"/>
     <param pos="0" name="os.vendor" value="AnyBus"/>
   </fingerprint>
+
   <fingerprint pattern="^Symmetry 2DBC">
     <description>AMAG Technology Symmetry EN-2DBC Access Controller</description>
     <example>Symmetry 2DBC STD APP (EN2DBC_00_EF_4F)</example>
@@ -1100,6 +1312,7 @@
     <param pos="0" name="hw.product" value="Symmetry EN-2DBC"/>
     <param pos="0" name="os.vendor" value="AMAG Technology"/>
   </fingerprint>
+
   <fingerprint pattern="^(1747-\S+) Home Page$">
     <description>Allen-Bradley 1747-LXXX SLC 5/05 Controller</description>
     <example hw.product="1747-L551">1747-L551 Home Page</example>
@@ -1110,6 +1323,7 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Allen-Bradley"/>
   </fingerprint>
+
   <fingerprint pattern="^(1766-\S+) (B/\S+)$">
     <description>Allen-Bradley 1766-L32BXB PLC</description>
     <example hw.product="1766-L32BXB" os.product="1766-L32BXB" os.version="B/11.00">1766-L32BXB B/11.00</example>
@@ -1121,6 +1335,7 @@
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
+
   <fingerprint pattern="^PLC-5 Ethernet Base Page$">
     <description>PLC-5 Ethernet Interface Module</description>
     <example>PLC-5 Ethernet Base Page</example>
@@ -1131,6 +1346,7 @@
     <param pos="0" name="os.device" value="PLC"/>
     <param pos="0" name="os.product" value="PLC-5"/>
   </fingerprint>
+
   <fingerprint pattern="^(1761-NET-\S+)$">
     <description>Allen-Bradley Ethernet Module</description>
     <example hw.product="1761-NET-EN">1761-NET-EN</example>
@@ -1140,6 +1356,7 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Allen-Bradley"/>
   </fingerprint>
+
   <fingerprint pattern="^(1785-\S+) Ethernet Base Page$">
     <description>Allen-Bradley 1785 Ethernet Module</description>
     <example hw.product="1785-ENET">1785-ENET Ethernet Base Page</example>
@@ -1148,6 +1365,7 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Allen-Bradley"/>
   </fingerprint>
+
   <fingerprint pattern="^NFT S7 - DALI-Gateway\(Ethernet\)$">
     <description>NFT DALI S7 Ethernet Module</description>
     <example>NFT S7 - DALI-Gateway(Ethernet)</example>
@@ -1156,6 +1374,7 @@
     <param pos="0" name="hw.product" value="S7 DALI Gateway"/>
     <param pos="0" name="os.vendor" value="NFT"/>
   </fingerprint>
+
   <fingerprint pattern="^IBHLink S7\+\+$">
     <description>IBHsofte IBHLink S7++</description>
     <example>IBHLink S7++</example>
@@ -1164,13 +1383,16 @@
     <param pos="0" name="hw.product" value="IBHLink S7++"/>
     <param pos="0" name="os.vendor" value="IBHsofte"/>
   </fingerprint>
+
   <!-- Software and Appliances -->
+
   <fingerprint pattern="^S7/S5 OPC Server$">
     <description>Softing Industrial S7/S5 OPC Server</description>
     <example>S7/S5 OPC Server</example>
     <param pos="0" name="service.vendor" value="Softing"/>
     <param pos="0" name="service.product" value="S7/S5 OPC Server"/>
   </fingerprint>
+
   <fingerprint pattern="^Nessus$">
     <description>Nessus</description>
     <example>Nessus</example>
@@ -1178,6 +1400,7 @@
     <param pos="0" name="service.product" value="Nessus"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:tenable:nessus:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Tenable Appliance$">
     <description>Tenable Appliance</description>
     <example>Tenable Appliance</example>
@@ -1185,6 +1408,7 @@
     <param pos="0" name="hw.device" value="Security Appliance"/>
     <param pos="0" name="hw.product" value="Tenable Appliance"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:Welcome to Citrix )?XenServer ([0-9\.]+)$">
     <description>XenServer</description>
     <example service.version="7.2.0">Welcome to Citrix XenServer 7.2.0</example>
@@ -1194,18 +1418,21 @@
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:citrix:xenserver:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^RabbitMQ Management$">
     <description>RabbitMQ Management</description>
     <example>RabbitMQ Management</example>
     <param pos="0" name="service.vendor" value="RabbitMQ"/>
     <param pos="0" name="service.product" value="Management Server"/>
   </fingerprint>
+
   <fingerprint pattern="^Statistics Report for HAProxy$">
     <description>HAProxy Stats Server</description>
     <example>Statistics Report for HAProxy</example>
     <param pos="0" name="service.vendor" value="HAProxy"/>
     <param pos="0" name="service.product" value="HAProxy Stats Server"/>
   </fingerprint>
+
   <fingerprint pattern="^Open Manage&amp;trade;$">
     <description>Dell OpenManage Admin</description>
     <example>Open Manage&amp;trade;</example>
@@ -1213,6 +1440,7 @@
     <param pos="0" name="service.product" value="OpenManage"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:dell:openmanage:-"/>
   </fingerprint>
+
   <fingerprint pattern="^TightVNC desktop \[(.*)\]$">
     <description>TightVNC Web Server</description>
     <example host.name="teller01">TightVNC desktop [teller01]</example>
@@ -1221,6 +1449,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:tightvnc:tightvnc:-"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
+
   <fingerprint pattern="^noVNC$">
     <description>noVNC Web Server</description>
     <example>noVNC</example>
@@ -1228,6 +1457,7 @@
     <param pos="0" name="service.product" value="noVNC"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:novnc:novnc:-"/>
   </fingerprint>
+
   <fingerprint pattern="^.* \[Jenkins\]$">
     <description>Jenkins Customized Dashboard</description>
     <example>Continuous Integrations [Jenkins]</example>
@@ -1236,24 +1466,36 @@
     <param pos="0" name="service.product" value="Jenkins"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:jenkins:jenkins:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Shell In A Box$">
     <description>Shell In A Box (OSS Project)</description>
     <example>Shell In A Box</example>
     <param pos="0" name="service.vendor" value="ShellInABox"/>
     <param pos="0" name="service.product" value="ShellInABox"/>
   </fingerprint>
+
   <fingerprint pattern="^AgilentLicenseManagerService Service$">
     <description>Agilent License Manager Service</description>
     <example>AgilentLicenseManagerService Service</example>
     <param pos="0" name="service.vendor" value="Agilent"/>
     <param pos="0" name="service.product" value="License Manager"/>
   </fingerprint>
-  <fingerprint pattern="^Red Hat OpenStack Platform Director$">
+
+  <fingerprint pattern="^Red Hat(?:.reg;)? OpenStack (?:Platform )?Director$">
     <description>Red Hat OpenStack Platform Director</description>
     <example>Red Hat OpenStack Platform Director</example>
+    <example>Red Hat&amp;reg; OpenStack Director</example>
     <param pos="0" name="service.vendor" value="Red Hat"/>
     <param pos="0" name="service.product" value="Open Stack Platform Director"/>
   </fingerprint>
+
+  <fingerprint pattern="^Login - OpenStack Dashboard$">
+    <description>OpenStack Dashboard</description>
+    <example>Login - OpenStack Dashboard</example>
+    <param pos="0" name="service.vendor" value="OpenStack"/>
+    <param pos="0" name="service.product" value="Dashboard"/>
+  </fingerprint>
+
   <fingerprint pattern="^splunkd$">
     <description>Splunk HTTP server used in the web interface, forwarders, indexers and more</description>
     <example>splunkd</example>
@@ -1261,24 +1503,30 @@
     <param pos="0" name="service.product" value="Splunk"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:splunk:splunk:-"/>
   </fingerprint>
-  <fingerprint pattern="^VMware Horizon$">
+
+  <fingerprint pattern="^VMware(?: Horizon(?: View)?|.nbsp;Horizon| View Portal)?$">
     <description>VMware Horizon</description>
     <example>VMware Horizon</example>
-    <param pos="0" name="service.vendor" value="VMWare"/>
+    <example>VMware Horizon View</example>
+    <example>VMware&amp;nbsp;Horizon</example>
+    <example>VMware View Portal</example>
+    <param pos="0" name="service.vendor" value="VMware"/>
     <param pos="0" name="service.product" value="Horizon"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:vmware:horizon:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Welcome to VMware Site Recovery Manager$">
     <description>VMware SRM</description>
     <example>Welcome to VMware Site Recovery Manager</example>
-    <param pos="0" name="os.vendor" value="VMWare"/>
+    <param pos="0" name="os.vendor" value="VMware"/>
     <param pos="0" name="os.product" value="Linux"/>
-    <param pos="0" name="hw.vendor" value="VMWare"/>
+    <param pos="0" name="hw.vendor" value="VMware"/>
     <param pos="0" name="hw.device" value="Appliance"/>
     <param pos="0" name="hw.product" value="Site Recovery Manager"/>
-    <param pos="0" name="service.vendor" value="VMWare"/>
+    <param pos="0" name="service.vendor" value="VMware"/>
     <param pos="0" name="service.product" value="Site Recovery Manager"/>
   </fingerprint>
+
   <fingerprint pattern="^Graylog Web Interface$">
     <description>Graylog Web Interface</description>
     <example>Graylog Web Interface</example>
@@ -1286,14 +1534,17 @@
     <param pos="0" name="service.product" value="Graylog"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:graylog:graylog:-"/>
   </fingerprint>
+
   <!-- The 'vendor' here has changed over time -->
-  <fingerprint pattern="^Kibana$">
+
+  <fingerprint pattern="^(?:Elastic\s+)?Kibana$">
     <description>Kibana Web Interface</description>
     <example>Kibana</example>
-    <param pos="0" name="service.vendor" value="Kibana"/>
+    <example>Elastic Kibana</example>
+    <param pos="0" name="service.vendor" value="Elastic"/>
     <param pos="0" name="service.product" value="Kibana"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:elasticsearch:kibana:-"/>
   </fingerprint>
+
   <fingerprint pattern="^Grafana$">
     <description>Grafana Web Interface</description>
     <example>Grafana</example>
@@ -1301,6 +1552,15 @@
     <param pos="0" name="service.product" value="Grafana"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:grafana:grafana:-"/>
   </fingerprint>
+
+  <fingerprint pattern="^Prometheus Time Series Collection and Processing Server$">
+    <description>Prometheus Web Interface</description>
+    <example>Prometheus Time Series Collection and Processing Server</example>
+    <param pos="0" name="service.vendor" value="Prometheus"/>
+    <param pos="0" name="service.product" value="Prometheus"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:prometheus:prometheus:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^Symantec Endpoint Protection Manager$">
     <description>Symantec Endpoint Protection Manager</description>
     <example>Symantec Endpoint Protection Manager</example>
@@ -1308,18 +1568,14 @@
     <param pos="0" name="service.product" value="Endpoint Protection Manager"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:symantec:endpoint_protection_manager:-"/>
   </fingerprint>
-  <fingerprint pattern="^Login Gateway - Kiwi Syslog Web Access$">
-    <description>Kiwi Syslog Web Access</description>
-    <example>Login Gateway - Kiwi Syslog Web Access</example>
-    <param pos="0" name="service.vendor" value="Solarwinds"/>
-    <param pos="0" name="service.product" value="Kiwi Syslog Web Access"/>
-  </fingerprint>
+
   <fingerprint pattern="^Hadoop Administration$">
     <description>Hadoop Administration Web Service</description>
     <example>Hadoop Administration</example>
     <param pos="0" name="service.vendor" value="Hadoop"/>
     <param pos="0" name="service.product" value="Hadoop Web Admin"/>
   </fingerprint>
+
   <fingerprint pattern="^ManageEngine OpManager$">
     <description>ManageEngine OpManager</description>
     <example>ManageEngine OpManager</example>
@@ -1327,8 +1583,17 @@
     <param pos="0" name="service.product" value="OpManager"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:manageengine:opmanager:-"/>
   </fingerprint>
+
+  <fingerprint pattern="^ManageEngine ADAudit Plus$">
+    <description>ManageEngineADAudit Plus</description>
+    <example>ManageEngine ADAudit Plus</example>
+    <param pos="0" name="service.vendor" value="ManageEngine"/>
+    <param pos="0" name="service.product" value="ADAudit Plus"/>
+  </fingerprint>
+
   <fingerprint pattern="^(ScanFront \d.+)Web Menu$">
     <!-- no space between the product model and "Web Menu" in the title -->
+
     <description>Canon ScanFront</description>
     <example os.product="ScanFront 220" hw.product="ScanFront 220">ScanFront 220Web Menu</example>
     <param pos="0" name="hw.device" value="Scanner"/>
@@ -1338,12 +1603,14 @@
     <param pos="0" name="os.vendor" value="Canon"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^CDVI Update$">
     <description>CDVI Door Control System</description>
     <example>CDVI Update</example>
     <param pos="0" name="hw.vendor" value="CDVI"/>
-    <param pos="0" name="hw.device" value="Access Controller"/>
+    <param pos="0" name="hw.device" value="Access Control"/>
   </fingerprint>
+
   <fingerprint pattern="^Liebert OpenComms Network Interface Card$">
     <description>Liebert UPS</description>
     <example>Liebert OpenComms Network Interface Card</example>
@@ -1352,6 +1619,7 @@
     <param pos="0" name="os.device" value="Power device"/>
     <param pos="0" name="os.vendor" value="Liebert"/>
   </fingerprint>
+
   <fingerprint pattern="^Excella Main Page$">
     <description>MagTek Excella STX Check Scanner</description>
     <example>Excella Main Page</example>
@@ -1362,6 +1630,7 @@
     <param pos="0" name="os.vendor" value="MagTek"/>
     <param pos="0" name="os.product" value="Excella"/>
   </fingerprint>
+
   <fingerprint pattern="^B426$">
     <description>Bosch Security Systems Ethernet Module (Alarm Panel)</description>
     <example>B426</example>
@@ -1370,6 +1639,7 @@
     <param pos="0" name="os.device" value="Alarm Panel"/>
     <param pos="0" name="os.vendor" value="Bosch"/>
   </fingerprint>
+
   <fingerprint pattern="^Citrix Login$">
     <description>Citrix NetScaler</description>
     <example>Citrix Login</example>
@@ -1383,6 +1653,50 @@
     <param pos="0" name="service.product" value="NetScaler"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:citrix:netscaler:-"/>
   </fingerprint>
+
+  <fingerprint pattern="^Netscaler Gateway$">
+    <description>Citrix Netscaler Gateway</description>
+    <example>Netscaler Gateway</example>
+    <param pos="0" name="os.vendor" value="Citrix"/>
+    <param pos="0" name="os.family" value="NetScaler"/>
+    <param pos="0" name="os.device" value="Network Management Device"/>
+    <param pos="0" name="os.product" value="NetScaler Gateway"/>
+    <param pos="0" name="service.vendor" value="Citrix"/>
+    <param pos="0" name="service.family" value="NetScaler"/>
+    <param pos="0" name="service.device" value="Network Management Device"/>
+    <param pos="0" name="service.product" value="NetScaler Gateway"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Citrix (?:NetScaler SDX|ADC SDX)$">
+    <description>Citrix NetScaler SDX Gateway</description>
+    <example>Citrix NetScaler SDX</example>
+    <example>Citrix ADC SDX</example>
+    <param pos="0" name="os.vendor" value="Citrix"/>
+    <param pos="0" name="os.family" value="NetScaler"/>
+    <param pos="0" name="os.device" value="Network Management Device"/>
+    <param pos="0" name="os.product" value="NetScaler SDX Gateway"/>
+    <param pos="0" name="service.vendor" value="Citrix"/>
+    <param pos="0" name="service.family" value="NetScaler"/>
+    <param pos="0" name="service.device" value="Network Management Device"/>
+    <param pos="0" name="service.product" value="NetScaler SDX Gateway"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Citrix NetScaler Insight Center$">
+    <description>Citrix NetScaler Insight Center</description>
+    <example>Citrix NetScaler Insight Center</example>
+    <param pos="0" name="service.vendor" value="Citrix"/>
+    <param pos="0" name="service.family" value="NetScaler"/>
+    <param pos="0" name="service.product" value="NetScaler Insight Center"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Brother ([^\s]+) series$">
+    <description>Brother Printers</description>
+    <example hw.product="MFC-L5900DW">Brother MFC-L5900DW series</example>
+    <param pos="0" name="hw.vendor" value="Brother"/>
+    <param pos="0" name="hw.device" value="Printer"/>
+    <param pos="1" name="hw.product"/>
+  </fingerprint>
+
   <fingerprint pattern="^HP (?:Color )?LaserJet ([^&amp;]+)&amp;">
     <description>HP LaserJet</description>
     <example hw.product="M1536dnf MFP">HP LaserJet M1536dnf MFP&amp;nbsp;&amp;nbsp;&amp;nbsp;1.1.1.1</example>
@@ -1391,6 +1705,7 @@
     <param pos="0" name="hw.device" value="Printer"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+
   <fingerprint pattern="^Jamf Pro Login - Jamf Pro v(\S+)$">
     <description>Jamf Pro</description>
     <example service.version="10.14.0-t1563397490">Jamf Pro Login - Jamf Pro v10.14.0-t1563397490</example>
@@ -1399,6 +1714,7 @@
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:jamf:jamf:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^Keyper Systems Administration - Login$">
     <description>Keyper Systems Administration - Login</description>
     <example>Keyper Systems Administration - Login</example>
@@ -1406,6 +1722,7 @@
     <param pos="0" name="hw.device" value="Access Control"/>
     <param pos="0" name="hw.product" value="Key Management"/>
   </fingerprint>
+
   <fingerprint pattern="FireEye:\s*$">
     <description>FireEye Investigation Analysis System Appliance</description>
     <example>FireEye:</example>
@@ -1413,6 +1730,7 @@
     <param pos="0" name="hw.product" value="IA Appliance"/>
     <param pos="0" name="hw.device" value="Security Appliance"/>
   </fingerprint>
+
   <fingerprint pattern="^GigaVUE-OS$">
     <description>Gigamon GigaVUE Appliance</description>
     <example>GigaVUE-OS</example>
@@ -1420,6 +1738,7 @@
     <param pos="0" name="hw.device" value="Monitoring"/>
     <param pos="0" name="hw.product" value="GigaVUE"/>
   </fingerprint>
+
   <fingerprint pattern="^Pure Storage Login$">
     <description>Pure Storage Appliance</description>
     <example>Pure Storage Login</example>
@@ -1427,6 +1746,15 @@
     <param pos="0" name="hw.device" value="NAS"/>
     <param pos="0" name="hw.product" value="Appliance"/>
   </fingerprint>
+
+  <fingerprint pattern="^Axonius Cybersecurity Asset Management Platform$">
+    <description>Axonius Appliance</description>
+    <example>Axonius Cybersecurity Asset Management Platform</example>
+    <param pos="0" name="hw.vendor" value="Axonius"/>
+    <param pos="0" name="hw.device" value="Security Appliance"/>
+    <param pos="0" name="hw.product" value="Asset Management"/>
+  </fingerprint>
+
   <fingerprint pattern="^CRESTRON$">
     <description>Crestron Video Conferencing</description>
     <example>CRESTRON</example>
@@ -1436,6 +1764,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.device" value="Video Conferencing"/>
   </fingerprint>
+
   <fingerprint pattern="^ELAN Viewer Installation$">
     <description>ELAN Smart Home Controller</description>
     <example>ELAN Viewer Installation</example>
@@ -1445,6 +1774,7 @@
     <param pos="0" name="os.vendor" value="ELAN"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^iTach IP2IR Setup and Configuration$">
     <description>iTach IP2IR</description>
     <example>iTach IP2IR Setup and Configuration</example>
@@ -1452,4 +1782,927 @@
     <param pos="0" name="hw.device" value="Device"/>
     <param pos="0" name="hw.product" value="IP2IR"/>
   </fingerprint>
-</fingerprints>
+
+  <fingerprint pattern="^AVTECH Device ManageR$">
+    <description>AVTECH Device ManageR Software</description>
+    <example>AVTECH Device ManageR</example>
+    <param pos="0" name="service.vendor" value="AVTECH"/>
+    <param pos="0" name="service.product" value="Device Manager"/>
+  </fingerprint>
+
+  <fingerprint pattern="^AVTECH Software, Inc\. - Room Alert(?:&amp;reg;)?\s+([a-zA-Z0-9/]+) - Advanced">
+    <description>AVTECH RoomAlert</description>
+    <example hw.product="Room Alert 11E" hw.product.model="11E">AVTECH Software, Inc. - Room Alert 11E - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
+    <example hw.product="Room Alert 32E/W" hw.product.model="32E/W">AVTECH Software, Inc. - Room Alert 32E/W - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
+    <example hw.product="Room Alert 32E/W" hw.product.model="32E/W">AVTECH Software, Inc. - Room Alert&amp;reg; 32E/W - Advanced Computer Room Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
+    <param pos="0" name="hw.vendor" value="AVTECH"/>
+    <param pos="0" name="hw.device" value="Monitoring"/>
+    <param pos="1" name="hw.product.model"/>
+    <param pos="0" name="hw.product" value="Room Alert {hw.product.model}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^AVTECH Software, Inc\. - TemPageR\s+([a-zA-Z0-9/]+) - Real-Time">
+    <description>AVTECH TepPageR</description>
+    <example hw.product="TemPageR 3E" hw.product.model="3E">AVTECH Software, Inc. - TemPageR 3E - Real-Time Temperature Monitor For IT &amp;amp; Facilities Environment Monitoring</example>
+    <param pos="0" name="hw.vendor" value="AVTECH"/>
+    <param pos="0" name="hw.device" value="Monitoring"/>
+    <param pos="1" name="hw.product.model"/>
+    <param pos="0" name="hw.product" value="TemPageR {hw.product.model}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^AppDynamics$">
+    <description>Cisco AppDynamics Appliance</description>
+    <example>AppDynamics</example>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="Network Appliance"/>
+    <param pos="0" name="hw.product" value="AppDynamics"/>
+  </fingerprint>
+
+  <fingerprint pattern="^INDECT - CarDetector Configurator$">
+    <description>INDECT Parking Management Console</description>
+    <example>INDECT - CarDetector Configurator</example>
+    <param pos="0" name="hw.vendor" value="INDECT"/>
+    <param pos="0" name="hw.device" value="Network Appliance"/>
+    <param pos="0" name="hw.product" value="CarDetector"/>
+  </fingerprint>
+
+  <fingerprint pattern="^J-Link Pro Webserver$">
+    <description>Segger J-Link Pro</description>
+    <example>J-Link Pro Webserver</example>
+    <param pos="0" name="hw.vendor" value="Segger"/>
+    <param pos="0" name="hw.device" value="JTAG Adapter"/>
+    <param pos="0" name="hw.product" value="J-Link Pro"/>
+  </fingerprint>
+
+  <fingerprint pattern="^OneFS$">
+    <description>EMC Isilon OneFS</description>
+    <example>OneFS</example>
+    <param pos="0" name="os.family" value="FreeBSD"/>
+    <param pos="0" name="os.vendor" value="EMC"/>
+    <param pos="0" name="os.product" value="Isilon OneFS OS"/>
+    <param pos="0" name="hw.vendor" value="EMC"/>
+    <param pos="0" name="hw.device" value="NAS"/>
+    <param pos="0" name="hw.product" value="Isilon OneFS"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Isilon InsightIQ$">
+    <description>EMC Isilon InsightIQ</description>
+    <example>Isilon InsightIQ</example>
+    <param pos="0" name="os.family" value="FreeBSD"/>
+    <param pos="0" name="os.vendor" value="EMC"/>
+    <param pos="0" name="os.product" value="Isilon OneFS OS"/>
+    <param pos="0" name="hw.vendor" value="EMC"/>
+    <param pos="0" name="hw.device" value="Network Appliance"/>
+    <param pos="0" name="hw.product" value="Isilon InsightIQ"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Active Intelligence Engine$">
+    <description>Attivio Active Intelligence Engine</description>
+    <example>Active Intelligence Engine</example>
+    <param pos="0" name="service.vendor" value="Attivio"/>
+    <param pos="0" name="service.product" value="Active Intelligence Engine"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Welcome to WildFly(?: Application Server)?\s+(\d+)">
+    <description>WildFly with version</description>
+    <example service.version="11">Welcome to WildFly 11</example>
+    <example service.version="8">Welcome to WildFly 8</example>
+    <example service.version="8">Welcome to WildFly Application Server 8</example>
+    <param pos="0" name="service.vendor" value="Red Hat"/>
+    <param pos="0" name="service.product" value="WildFly"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:redhat:wildfly:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Welcome to WildFly$">
+    <description>WildFly with no version</description>
+    <example>Welcome to WildFly</example>
+    <param pos="0" name="service.vendor" value="Red Hat"/>
+    <param pos="0" name="service.product" value="WildFly"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:redhat:wildfly:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Welcome to JBoss Application Server ([\d\.]+)$">
+    <description>JBoss Application Server w/ Version</description>
+    <example service.version="7">Welcome to JBoss Application Server 7</example>
+    <param pos="0" name="service.vendor" value="Red Hat"/>
+    <param pos="0" name="service.product" value="JBoss AS"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:redhat:jboss_wildfly_application_server:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Welcome to JBoss(?: AS|.trade;)$">
+    <description>JBoss Application Server w/o Version</description>
+    <example>Welcome to JBoss AS</example>
+    <example>Welcome to JBoss&amp;trade;</example>
+    <param pos="0" name="service.vendor" value="Red Hat"/>
+    <param pos="0" name="service.product" value="JBoss AS"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:redhat:jboss_wildfly_application_server:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:JBoss )?EAP ([\d\.]+)$">
+    <description>JBoss EAP w/ Version</description>
+    <example service.version="7">JBoss EAP 7</example>
+    <example service.version="7">EAP 7</example>
+    <param pos="0" name="service.vendor" value="Red Hat"/>
+    <param pos="0" name="service.product" value="JBoss EAP"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:redhat:jboss_enterprise_application_platform:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Welcome to JBoss EAP$">
+    <description>JBoss EAP w/o Version</description>
+    <example>Welcome to JBoss EAP</example>
+    <param pos="0" name="service.vendor" value="Red Hat"/>
+    <param pos="0" name="service.product" value="JBoss EAP"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:redhat:jboss_enterprise_application_platform:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^S2 Network Node$">
+    <description>S2 Network Node Appliance</description>
+    <example>S2 Network Node</example>
+    <param pos="0" name="hw.vendor" value="S2"/>
+    <param pos="0" name="hw.device" value="Access Control"/>
+    <param pos="0" name="hw.product" value="Network Node"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:S2 Netbox Login|Home - NetBox)$">
+    <description>S2 Netbox Appliance</description>
+    <example>S2 Netbox Login</example>
+    <example>Home - NetBox</example>
+    <param pos="0" name="hw.vendor" value="S2"/>
+    <param pos="0" name="hw.device" value="Access Control"/>
+    <param pos="0" name="hw.product" value="Netbox"/>
+  </fingerprint>
+
+  <fingerprint pattern="^S2 NetVR Login$">
+    <description>S2 NetVR Appliance</description>
+    <example>S2 NetVR Login</example>
+    <param pos="0" name="hw.vendor" value="S2"/>
+    <param pos="0" name="hw.device" value="Access Control"/>
+    <param pos="0" name="hw.product" value="NetVR"/>
+  </fingerprint>
+
+  <fingerprint pattern="^IBM HTTP Server$">
+    <description>IBM HTTP Server w/o Version</description>
+    <example>IBM HTTP Server</example>
+    <param pos="0" name="service.vendor" value="IBM"/>
+    <param pos="0" name="service.product" value="HTTPD"/>
+    <param pos="0" name="service.family" value="Apache"/>
+  </fingerprint>
+
+  <fingerprint pattern="^IBM HTTP Server ([0-9\.]+)$">
+    <description>IBM HTTP Server with Version</description>
+    <example service.version="8.5.5">IBM HTTP Server 8.5.5</example>
+    <param pos="0" name="service.vendor" value="IBM"/>
+    <param pos="0" name="service.product" value="HTTPD"/>
+    <param pos="0" name="service.family" value="Apache"/>
+    <param pos="1" name="service.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="^IBM Tivoli Storage Manager$">
+    <description>IBM Tivoli Storage Manager</description>
+    <example>IBM Tivoli Storage Manager</example>
+    <param pos="0" name="service.vendor" value="IBM"/>
+    <param pos="0" name="service.family" value="Tivoli"/>
+    <param pos="0" name="service.product" value="Tivoli Storage Manager"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:ibm:tivoli_storage_manager:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^IBM FlashCopy Manager$">
+    <description>IBM FlashCopy Manager</description>
+    <example>IBM FlashCopy Manager</example>
+    <param pos="0" name="service.vendor" value="IBM"/>
+    <param pos="0" name="service.family" value="Tivoli"/>
+    <param pos="0" name="service.product" value="Tivoli Storage FlashCopy Manager"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:ibm:tivoli_storage_flashcopy_manager:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Jupyter Notebook|JupyterLab|Home Page - Select or create a notebook)$">
+    <description>Jupyter Notebook Server</description>
+    <example>Jupyter Notebook</example>
+    <example>JupyterLab</example>
+    <example>Home Page - Select or create a notebook</example>
+    <param pos="0" name="service.vendor" value="Jupyter"/>
+    <param pos="0" name="service.product" value="Notebook"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:jupyter:notebook:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Redirect to userimage: /control/userimage\.html$">
+    <description>Mobotix Network Camera</description>
+    <example>Redirect to userimage: /control/userimage.html</example>
+    <param pos="0" name="hw.vendor" value="Mobotix"/>
+    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.product" value="IP Camera"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Apache ActiveMQ$">
+    <description>Apache ActiveMQ</description>
+    <example>Apache ActiveMQ</example>
+    <param pos="0" name="service.vendor" value="Apache"/>
+    <param pos="0" name="service.family" value="ActiveMQ"/>
+    <param pos="0" name="service.product" value="ActiveMQ"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apache:activemq:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Google Wifi$">
+    <description>Google OnHub Router</description>
+    <example>Google Wifi</example>
+    <param pos="0" name="os.vendor" value="Google"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="hw.vendor" value="Google"/>
+    <param pos="0" name="hw.device" value="Router"/>
+    <param pos="0" name="hw.product" value="OnHub"/>
+  </fingerprint>
+
+  <fingerprint pattern="PRTG Network Monitor">
+    <description>PRTG Network Monitor (not anchored)</description>
+    <example>PRTG Network Monitor (WIN-R4C1T8HRRAA)</example>
+    <example>BigCorp PRTG Network Monitor (PRTG2)</example>
+    <param pos="0" name="service.vendor" value="PRTG"/>
+    <param pos="0" name="service.product" value="Network Monitor"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:BrightSign&amp;reg;|BrightSign Applications|Diagnostics Web Server)$">
+    <description>BrightSign Controller</description>
+    <example>BrightSign&amp;reg;</example>
+    <example>BrightSign Applications</example>
+    <example>Diagnostics Web Server</example>
+    <param pos="0" name="os.vendor" value="BrightSign"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="hw.vendor" value="BrightSign"/>
+    <param pos="0" name="hw.device" value="Media Server"/>
+    <param pos="0" name="hw.product" value="Digital Signage Player"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Linksys Smart Wi-Fi$">
+    <description>Linksys Smart Wi-Fi</description>
+    <example>Linksys Smart Wi-Fi</example>
+    <param pos="0" name="os.vendor" value="Linksys"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="hw.vendor" value="Linksys"/>
+    <param pos="0" name="hw.device" value="WAP"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:DD System Manager|System Manager)$">
+    <description>Data Domain System Manager</description>
+    <example>DD System Manager</example>
+    <example>System Manager</example>
+    <param pos="0" name="os.vendor" value="Data Domain"/>
+    <param pos="0" name="os.product" value="DD OS"/>
+    <param pos="0" name="os.device" value="Storage"/>
+    <param pos="0" name="hw.vendor" value="Data Domain"/>
+    <param pos="0" name="hw.product" value="DD OS"/>
+    <param pos="0" name="hw.device" value="Storage"/>
+  </fingerprint>
+
+  <fingerprint pattern="^SonarQube$">
+    <description>SonarQube</description>
+    <example>SonarQube</example>
+    <param pos="0" name="service.vendor" value="SonarQube"/>
+    <param pos="0" name="service.product" value="SonarQube"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\S+) - Opengear Management Console$">
+    <description>Opengear Management Console</description>
+    <example host.name="server01">server01 - Opengear Management Console</example>
+    <param pos="0" name="service.vendor" value="Opengear"/>
+    <param pos="0" name="service.product" value="Management Console"/>
+    <param pos="1" name="host.name"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Login \(Virtual Traffic Manager Appliance :: (\S+)\)$">
+    <description>Brocade Virtual Traffic Manager Appliance</description>
+    <example host.name="10.0.0.1">Login (Virtual Traffic Manager Appliance :: 10.0.0.1)</example>
+    <param pos="0" name="hw.vendor" value="Brocade"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
+    <param pos="0" name="hw.product" value="Virtual Traffic Manager"/>
+    <param pos="1" name="host.name"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Chronograf$">
+    <description>Chronograf Dashboard</description>
+    <example>Chronograf</example>
+    <param pos="0" name="service.vendor" value="InfluxData"/>
+    <param pos="0" name="service.product" value="Chronograf"/>
+  </fingerprint>
+
+  <fingerprint pattern="^InfluxDB 2.0$">
+    <description>InfluxDB 2.0 Dashboard</description>
+    <example>InfluxDB 2.0</example>
+    <param pos="0" name="service.vendor" value="InfluxData"/>
+    <param pos="0" name="service.product" value="InfluxDB"/>
+    <param pos="0" name="service.version" value="2.0"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:influxdata:influxdb:2.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Sign in . GitLab|GitLab|GitLab is not responding)$">
+    <description>GitLab</description>
+    <example>Sign in · GitLab</example>
+    <example>GitLab is not responding</example>
+    <example>GitLab</example>
+    <example>Sign in | GitLab</example>
+    <param pos="0" name="service.vendor" value="GitLab"/>
+    <param pos="0" name="service.product" value="GitLab"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:gitlab:gitlab:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:GitHub Enterprise|Setup GitHub Enterprise|GitHub Enterprise preflight check)$">
+    <description>GitHub Enterprise</description>
+    <example>GitHub Enterprise</example>
+    <example>Setup GitHub Enterprise</example>
+    <example>GitHub Enterprise preflight check</example>
+    <param pos="0" name="service.vendor" value="GitHub"/>
+    <param pos="0" name="service.product" value="Enterprise"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:SAP NetWeaver Application Server Java|SAP&amp;#x20;NetWeaver&amp;#x20;Portal|Loading Portal\.\.\.)$">
+    <description>SAP NetWeaver Portal</description>
+    <example>SAP NetWeaver Application Server Java</example>
+    <example>SAP&amp;#x20;NetWeaver&amp;#x20;Portal</example>
+    <example>Loading Portal...</example>
+    <param pos="0" name="service.vendor" value="SAP"/>
+    <param pos="0" name="service.product" value="NetWeaver Web AS"/>
+    <param pos="0" name="service.family" value="NetWeaver"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Lansweeper (?:- Login|First Run Wizard)$">
+    <description>Lansweeper</description>
+    <example>Lansweeper - Login</example>
+    <example>Lansweeper First Run Wizard</example>
+    <param pos="0" name="service.vendor" value="Lansweeper"/>
+    <param pos="0" name="service.product" value="Lansweeper"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:lansweeper:lansweeper:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Celery Flower|Flower)$">
+    <description>Celery Flower Dashboard</description>
+    <example>Celery Flower</example>
+    <example>Flower</example>
+    <param pos="0" name="service.vendor" value="Celery"/>
+    <param pos="0" name="service.product" value="Flower"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Insight)?VM Security Console :: Login$">
+    <description>Rapid7 InsightVM Console</description>
+    <example>InsightVM Security Console :: Login</example>
+    <example>VM Security Console :: Login</example>
+    <param pos="0" name="service.vendor" value="Rapid7"/>
+    <param pos="0" name="service.product" value="InsightVM"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:rapid7:insightvm:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Nexpose Security Console :: Login$">
+    <description>Rapid7 Nexpose Console</description>
+    <example>Nexpose Security Console :: Login</example>
+    <param pos="0" name="service.vendor" value="Rapid7"/>
+    <param pos="0" name="service.product" value="Nexpose"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:rapid7:nexpose:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Login Gateway|Session Error) - Kiwi Syslog Web Access$">
+    <description>Kiwi Syslog Web Access</description>
+    <example>Login Gateway - Kiwi Syslog Web Access</example>
+    <example>Session Error - Kiwi Syslog Web Access</example>
+    <param pos="0" name="service.vendor" value="SolarWinds"/>
+    <param pos="0" name="service.product" value="Kiwi Syslog"/>
+  </fingerprint>
+
+  <fingerprint pattern="^ClickShare Configurator$">
+    <description>ClickShare Wireless Presenter</description>
+    <example>ClickShare Configurator</example>
+    <param pos="0" name="hw.vendor" value="Barco"/>
+    <param pos="0" name="hw.device" value="Wireless Presenter"/>
+    <param pos="0" name="hw.product" value="ClickShare"/>
+    <param pos="0" name="os.vendor" value="Barco"/>
+    <param pos="0" name="os.family" value="ClickShareOS"/>
+    <param pos="0" name="os.device" value="Wireless Presenter"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(IQ\S+) IQEYE\S+: Live Images$">
+    <description>IQinVision IQeye Network Camera</description>
+    <example hw.product="IQA22N">IQA22N IQEYE1A1613: Live Images</example>
+    <example hw.product="IQeye703">IQeye703 IQEYE011750: Live Images</example>
+    <param pos="0" name="hw.vendor" value="IQinVision"/>
+    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="1" name="hw.product"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Oracle\(R\) )?Integrated Lights Out Manager$">
+    <description>Oracle iLOM</description>
+    <example>Oracle(R) Integrated Lights Out Manager</example>
+    <example>Integrated Lights Out Manager</example>
+    <param pos="0" name="hw.device" value="Lights Out Management"/>
+    <param pos="0" name="hw.vendor" value="Oracle"/>
+    <param pos="0" name="hw.family" value="ILOM"/>
+    <param pos="0" name="hw.product" value="ILOM"/>
+    <param pos="0" name="os.device" value="Lights Out Management"/>
+    <param pos="0" name="os.vendor" value="Oracle"/>
+    <param pos="0" name="os.family" value="ILOM"/>
+    <param pos="0" name="os.product" value="ILOM"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Genetec - SHARPV\S+$">
+    <description>Genetec AutoVu SharpV ALPR Camera</description>
+    <example>Genetec - SHARPV01111</example>
+    <param pos="0" name="hw.vendor" value="Genetec"/>
+    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.product" value="AutoVu SharpV"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Nexus Repository Manager$">
+    <description>Nexus Repository Manager</description>
+    <example>Nexus Repository Manager</example>
+    <param pos="0" name="service.vendor" value="Apache"/>
+    <param pos="0" name="service.product" value="Nexus Repository Manager"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Apache Flink Web Dashboard$">
+    <description>Apache Flink Web Dashboard</description>
+    <example>Apache Flink Web Dashboard</example>
+    <param pos="0" name="service.vendor" value="Apache"/>
+    <param pos="0" name="service.product" value="Flink"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apache:flink:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Twonky|Twonky Server|TwonkyMedia|TwonkyMedia server media browser)$">
+    <description>Twonky Server</description>
+    <example>Twonky</example>
+    <example>Twonky Server</example>
+    <example>TwonkyMedia</example>
+    <example>TwonkyMedia server media browser</example>
+    <param pos="0" name="service.vendor" value="Lynx Technology"/>
+    <param pos="0" name="service.product" value="Twonky Media Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Spiceworks(?: Server Busy| Help Desk)?$">
+    <description>Spiceworks</description>
+    <example>Spiceworks</example>
+    <example>Spiceworks Help Desk</example>
+    <example>Spiceworks Server Busy</example>
+    <param pos="0" name="service.vendor" value="Spiceworks"/>
+    <param pos="0" name="service.product" value="Help Desk Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Network Monitor$">
+    <description>Spiceworks Network Monitor</description>
+    <example>Network Monitor</example>
+    <param pos="0" name="service.vendor" value="Spiceworks"/>
+    <param pos="0" name="service.product" value="Network Monitor"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Spirent TestCenter IQ(?: - (?:Free )?Preview)?$">
+    <description>Spirent TestCenter IQ</description>
+    <example>Spirent TestCenter IQ</example>
+    <example>Spirent TestCenter IQ - Free Preview</example>
+    <example>Spirent TestCenter IQ - Preview</example>
+    <param pos="0" name="service.vendor" value="Spirent Communications"/>
+    <param pos="0" name="service.product" value="TestCenter IQ"/>
+  </fingerprint>
+
+  <fingerprint pattern="^SABnzbd(?: - Log in)?$">
+    <description>SABnzbd Newsreader</description>
+    <example>SABnzbd</example>
+    <example>SABnzbd - Log in</example>
+    <param pos="0" name="service.vendor" value="SABnzbd"/>
+    <param pos="0" name="service.product" value="SABnzbd"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Zabbix|.*: Zabbix)$">
+    <description>Zabbix</description>
+    <example>Zabbix</example>
+    <example>appliance: Zabbix</example>
+    <param pos="0" name="service.vendor" value="Zabbix"/>
+    <param pos="0" name="service.product" value="Zabbix"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:zabbix:zabbix:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\S+) \(build (\S+)\) - Info$">
+    <description>DD-WRT</description>
+    <example host.name="SubTerraVia-NUC" os.version="36104" os.build="36104">SubTerraVia-NUC (build 36104) - Info</example>
+    <example host.name="DD-WRT" os.version="35030M" os.build="35030M">DD-WRT (build 35030M) - Info</example>
+    <param pos="0" name="os.vendor" value="DD-WRT"/>
+    <param pos="0" name="os.product" value="DD-WRT"/>
+    <param pos="0" name="os.device" value="Router"/>
+    <param pos="1" name="host.name"/>
+    <param pos="2" name="os.version"/>
+    <param pos="2" name="os.build"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:dd-wrt:dd-wrt:{os.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Apache Druid|Druid Console|Legacy Coordinator Console)$">
+    <description>Apache Druid</description>
+    <example>Apache Druid</example>
+    <example>Legacy Coordinator Console</example>
+    <example>Druid Console</example>
+    <param pos="0" name="service.vendor" value="Apache"/>
+    <param pos="0" name="service.product" value="Druid"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apache:druid:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Gerrit Code Review$">
+    <description>Gerrit Code Review</description>
+    <example>Gerrit Code Review</example>
+    <param pos="0" name="service.vendor" value="Gerrit"/>
+    <param pos="0" name="service.product" value="Code Review"/>
+  </fingerprint>
+
+  <fingerprint pattern=" - Ignition Gateway$">
+    <description>Inductive Automation Ignition Gateway</description>
+    <example>QA-ROBOT3 - Ignition Gateway</example>
+    <example>Ignition 8.0 Demo Server - Ignition Gateway</example>
+    <param pos="0" name="service.vendor" value="Inductive Automation"/>
+    <param pos="0" name="service.product" value="Ignition Gateway"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Airflow(?: - (?:Login|DAGs))?$">
+    <description>Apache Airflow</description>
+    <example>Airflow</example>
+    <example>Airflow - DAGs</example>
+    <example>Airflow - Login</example>
+    <param pos="0" name="service.vendor" value="Apache"/>
+    <param pos="0" name="service.product" value="Airflow"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apache:airflow:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Cockroach Console$">
+    <description>CockroachDB Console</description>
+    <example>Cockroach Console</example>
+    <param pos="0" name="service.vendor" value="Cockroach Labs"/>
+    <param pos="0" name="service.product" value="CockroachDB"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:openmediavault control panel|OpenMediaVault web administration interface) - (\S+)$">
+    <description>OpenMediaVault</description>
+    <example host.name="raspberrypi">openmediavault control panel - raspberrypi</example>
+    <example host.name="raspberrypi">OpenMediaVault web administration interface - raspberrypi</example>
+    <param pos="0" name="os.vendor" value="OpenMediaVault"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="OpenMediaVault"/>
+    <param pos="0" name="os.device" value="NAS"/>
+    <param pos="1" name="host.name"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Log in to TeamCity .mdash; TeamCity$">
+    <description>TeamCity</description>
+    <example>Log in to TeamCity &amp;mdash; TeamCity</example>
+    <param pos="0" name="service.vendor" value="JetBrains"/>
+    <param pos="0" name="service.product" value="TeamCity"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:jetbrains:teamcity:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Home - CUPS ([\d\.]+)$">
+    <description>Apple CUPS</description>
+    <example service.version="2.3.1">Home - CUPS 2.3.1</example>
+    <param pos="0" name="service.vendor" value="Apple"/>
+    <param pos="0" name="service.product" value="CUPS"/>
+    <param pos="0" name="service.family" value="CUPS"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apple:cups:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^RUNDECK ENTERPRISE - Login$">
+    <description>Rundeck Enterprise</description>
+    <example>RUNDECK ENTERPRISE - Login</example>
+    <param pos="0" name="service.vendor" value="Rundeck"/>
+    <param pos="0" name="service.product" value="Rundeck Enterprise"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Rundeck - Login$">
+    <description>Rundeck</description>
+    <example>Rundeck - Login</example>
+    <param pos="0" name="service.vendor" value="Rundeck"/>
+    <param pos="0" name="service.product" value="Rundeck"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:rundeck:rundeck:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^CrushFTP WebInterface$">
+    <description>CrushFTP Web</description>
+    <example>CrushFTP WebInterface</example>
+    <param pos="0" name="service.vendor" value="CrushFTP"/>
+    <param pos="0" name="service.product" value="CrushFTP Web Interface"/>
+    <param pos="0" name="service.certainty" value="0.5"/>
+  </fingerprint>
+
+  <fingerprint pattern="^OpenEdge Explorer$">
+    <description>Progress OpenEdge Explorer</description>
+    <example>OpenEdge Explorer</example>
+    <param pos="0" name="service.vendor" value="Progress"/>
+    <param pos="0" name="service.product" value="OpenEdge Explorer"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Consul by HashiCorp$">
+    <description>HashiCorp Consul</description>
+    <example>Consul by HashiCorp</example>
+    <param pos="0" name="service.vendor" value="HashiCorp"/>
+    <param pos="0" name="service.product" value="Consul"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:hashicorp:consul:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Redmine(?: 500 error)?$">
+    <description>Redmine</description>
+    <example>Redmine</example>
+    <param pos="0" name="service.vendor" value="Redmine"/>
+    <param pos="0" name="service.product" value="Redmine"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:redmine:redmine:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="; Nagios Log Server$">
+    <description>Nagios Log Server</description>
+    <example>Database Offline &amp;middot; Nagios Log Server</example>
+    <param pos="0" name="service.vendor" value="Nagios"/>
+    <param pos="0" name="service.product" value="Nagios Log Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="; Nagios Network Analyzer$">
+    <description>Nagios Network Analyzer</description>
+    <example>Login &amp;bull; Nagios Network Analyzer</example>
+    <example>Licensing &amp;bull; Nagios Network Analyzer</example>
+    <param pos="0" name="service.vendor" value="Nagios"/>
+    <param pos="0" name="service.product" value="Nagios Network Analyzer"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Zing Vision$">
+    <description>Zing Vision</description>
+    <example>Zing Vision</example>
+    <param pos="0" name="service.vendor" value="Azul Systems"/>
+    <param pos="0" name="service.product" value="Zing Vision"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Swagger (?:UI|Editor)$">
+    <description>Swagger UI</description>
+    <example>Swagger UI</example>
+    <example>Swagger Editor</example>
+    <param pos="0" name="service.vendor" value="Swagger"/>
+    <param pos="0" name="service.product" value="UI"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Emby$">
+    <description>Emby Media Server</description>
+    <example>Emby</example>
+    <param pos="0" name="service.vendor" value="Emby"/>
+    <param pos="0" name="service.product" value="Web Client"/>
+    <param pos="0" name="service.device" value="Media Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="^WS - Folding@home Work Server$">
+    <description>Folding@home Work Server</description>
+    <example>WS - Folding@home Work Server</example>
+    <param pos="0" name="service.vendor" value="Folding@home"/>
+    <param pos="0" name="service.product" value="Work Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Welcome to IBM Lotus Sametime$">
+    <description>IBM Lotus Sametime</description>
+    <example>Welcome to IBM Lotus Sametime</example>
+    <param pos="0" name="service.vendor" value="IBM"/>
+    <param pos="0" name="service.product" value="Lotus Sametime"/>
+    <param pos="0" name="service.certainty" value="0.5"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_sametime:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^HPE OfficeConnect Switch (.*)\s+(J\S+)$">
+    <description>HPE OfficeConnect Switch</description>
+    <example hw.product="1820 24G" hw.model="J9980A">HPE OfficeConnect Switch 1820 24G J9980A</example>
+    <example hw.product="1820 8G" hw.model="J9979A">HPE OfficeConnect Switch 1820 8G J9979A</example>
+    <example hw.product="1920S 24G 2SFP PoE+ (370W)" hw.model="JL385A">HPE OfficeConnect Switch 1920S 24G 2SFP PoE+ (370W) JL385A</example>
+    <param pos="0" name="hw.vendor" value="HPE"/>
+    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.model"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Device42$">
+    <description>Device42 Virtual Appliance</description>
+    <example>Device42</example>
+    <param pos="0" name="os.vendor" value="Device42"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.certainty" value="0.5"/>
+    <param pos="0" name="hw.vendor" value="Device42"/>
+    <param pos="0" name="hw.device" value="Network Appliance"/>
+    <param pos="0" name="hw.product" value="Discovery"/>
+    <param pos="0" name="hw.certainty" value="0.5"/>
+  </fingerprint>
+
+  <fingerprint pattern="^SolarWinds Virtualization Manager$">
+    <description>SolarWinds Virtualization Manager</description>
+    <example>SolarWinds Virtualization Manager</example>
+    <param pos="0" name="service.vendor" value="SolarWinds"/>
+    <param pos="0" name="service.product" value="Virtualization Manager"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Gitea: .*|LocalRepo|TurnKey Gitea)$">
+    <description>Gitea</description>
+    <example>Gitea: Git with a cup of tea</example>
+    <example>TurnKey Gitea</example>
+    <example>LocalRepo</example>
+    <param pos="0" name="service.vendor" value="Gitea"/>
+    <param pos="0" name="service.product" value="Gitea"/>
+    <param pos="0" name="service.certainty" value="0.5"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:gitea:gitea:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Metasploit$">
+    <description>Metasploit Pro (and Community Edition Web UI)</description>
+    <example>Metasploit</example>
+    <param pos="0" name="service.vendor" value="Rapid7"/>
+    <param pos="0" name="service.product" value="Metasploit Pro"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Makito X Decoder$">
+    <description>Haivision Makito X Video Decoder</description>
+    <example>Makito X Decoder</example>
+    <param pos="0" name="hw.vendor" value="Haivision"/>
+    <param pos="0" name="hw.device" value="Video Decoder"/>
+    <param pos="0" name="hw.product" value="Makito X Decoder"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Ceph(?: Dashboard)?$">
+    <description>Ceph Dashboard</description>
+    <example>Ceph Dashboard</example>
+    <example>Ceph</example>
+    <param pos="0" name="service.vendor" value="Ceph"/>
+    <param pos="0" name="service.product" value="Dashboard"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Scrutinizer$">
+    <description>Plixer Scrutinizer</description>
+    <example>Scrutinizer</example>
+    <param pos="0" name="os.vendor" value="Plixer"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.certainty" value="0.5"/>
+    <param pos="0" name="hw.vendor" value="Plixer"/>
+    <param pos="0" name="hw.product" value="Scrutinizer"/>
+    <param pos="0" name="hw.certainty" value="0.5"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Hortonworks SmartSense Tool is loading\.\.\.$">
+    <description>Cloudera Hortonworks SmartSense Tool</description>
+    <example>Hortonworks SmartSense Tool is loading...</example>
+    <param pos="0" name="service.vendor" value="Cloudera"/>
+    <param pos="0" name="service.product" value="SmartSense Tool"/>
+    <param pos="0" name="service.certainty" value="0.5"/>
+  </fingerprint>
+
+  <fingerprint pattern="^ownCloud$">
+    <description>ownCloud</description>
+    <example>ownCloud</example>
+    <param pos="0" name="service.vendor" value="ownCloud"/>
+    <param pos="0" name="service.product" value="ownCloud Server"/>
+    <param pos="0" name="service.certainty" value="0.5"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Octopus Deploy$">
+    <description>Octopus Deploy</description>
+    <example>Octopus Deploy</example>
+    <param pos="0" name="service.vendor" value="Octopus"/>
+    <param pos="0" name="service.product" value="Deploy"/>
+    <param pos="0" name="service.certainty" value="0.5"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Android Debug Database$">
+    <description>Android Debug Database</description>
+    <example>Android Debug Database</example>
+    <param pos="0" name="service.vendor" value="Android Debug Database"/>
+    <param pos="0" name="service.product" value="Android Debug Database"/>
+  </fingerprint>
+
+  <fingerprint pattern="^RStudio Sign In$">
+    <description>RStudio</description>
+    <example>RStudio Sign In</example>
+    <param pos="0" name="service.vendor" value="RStudio"/>
+    <param pos="0" name="service.product" value="Connect"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:TurnKey Moodle|New Site)$">
+    <description>Moodle</description>
+    <example>TurnKey Moodle</example>
+    <example>New Site</example>
+    <param pos="0" name="service.vendor" value="Moodle"/>
+    <param pos="0" name="service.product" value="Moodle CMS"/>
+    <param pos="0" name="service.certainty" value="0.5"/>
+  </fingerprint>
+
+  <fingerprint pattern="^ArchiveTeam Warrior$">
+    <description>Internet Archive Warrior Appliance</description>
+    <example>ArchiveTeam Warrior</example>
+    <param pos="0" name="os.vendor" value="Internet Archive"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="hw.vendor" value="Internet Archive"/>
+    <param pos="0" name="hw.device" value="Storage Appliance"/>
+    <param pos="0" name="hw.product" value="ArchiveTeam Warrior"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Dashboard|Log In) - Confluence$">
+    <description>Atlassian Confluence</description>
+    <example>Dashboard - Confluence</example>
+    <example>Log In - Confluence</example>
+    <param pos="0" name="service.vendor" value="Atlassian"/>
+    <param pos="0" name="service.product" value="Confluence"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:atlassian:confluence:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^System Dashboard - ">
+    <description>Atlassian Jira</description>
+    <example>System Dashboard - Jira</example>
+    <example>System Dashboard - [Dev Test JIRA]</example>
+    <param pos="0" name="service.vendor" value="Atlassian"/>
+    <param pos="0" name="service.product" value="Jira"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:atlassian:jira:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Welcome to XAMPP|XAMPP for Linux)">
+    <description>XAMPP Server</description>
+    <example>Welcome to XAMPP</example>
+    <example>XAMPP for Linux</example>
+    <param pos="0" name="service.vendor" value="XAMPP"/>
+    <param pos="0" name="service.product" value="XAMPP Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Greenbone Security (?:Assistant|Manager)">
+    <description>Greenbone Security Scanner</description>
+    <example>Greenbone Security Assistant</example>
+    <example>Greenbone Security Manager</example>
+    <param pos="0" name="service.vendor" value="Greenbone"/>
+    <param pos="0" name="service.product" value="Security Scanner"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Kodi$">
+    <description>Kodi Media Server</description>
+    <example>Kodi</example>
+    <param pos="0" name="service.vendor" value="Kodi"/>
+    <param pos="0" name="service.product" value="Media Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Drupal|TurnKey Drupal\d+|Select an installation profile)$">
+    <description>Drupal CMS</description>
+    <example>Drupal</example>
+    <example>TurnKey Drupal8</example>
+    <example>TurnKey Drupal7</example>
+    <example>Select an installation profile</example>
+    <param pos="0" name="service.vendor" value="Drupal"/>
+    <param pos="0" name="service.product" value="CMS"/>
+  </fingerprint>
+
+  <fingerprint pattern="^LibreNMS$">
+    <description>LibreNMS</description>
+    <example>LibreNMS</example>
+    <param pos="0" name="service.vendor" value="LibreNMS"/>
+    <param pos="0" name="service.product" value="LibreNMS"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:librenms:librenms:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^HDHomeRun Main Menu$">
+    <description>HDHomeRun</description>
+    <example>HDHomeRun Main Menu</example>
+    <param pos="0" name="os.vendor" value="SiliconDust"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="hw.vendor" value="SiliconDust"/>
+    <param pos="0" name="hw.device" value="Media Server"/>
+    <param pos="0" name="hw.product" value="HDHomeRun"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Kubernetes Dashboard$">
+    <description>Kubernetes Dashboard</description>
+    <example>Kubernetes Dashboard</example>
+    <param pos="0" name="service.vendor" value="Kubernetes"/>
+    <param pos="0" name="service.product" value="Dashboard"/>
+  </fingerprint>
+
+  <fingerprint pattern="^SoundTouch Access Point Setup$">
+    <description>Bose SoundTouch</description>
+    <example>SoundTouch Access Point Setup</example>
+    <param pos="0" name="hw.device" value="Network Audio"/>
+    <param pos="0" name="hw.vendor" value="Bose"/>
+    <param pos="0" name="hw.family" value="SoundTouch"/>
+    <param pos="0" name="os.device" value="Network Audio"/>
+    <param pos="0" name="os.vendor" value="Bose"/>
+    <param pos="0" name="os.product" value="SoundTouch"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:embedded )?WS server test page$">
+    <description>Dell iDRAC Websocket Endpoint</description>
+    <example>WS server test page</example>
+    <example>embedded WS server test page</example>
+    <param pos="0" name="hw.device" value="Lights Out Management"/>
+    <param pos="0" name="hw.vendor" value="Dell"/>
+    <param pos="0" name="hw.product" value="iDRAC"/>
+    <param pos="0" name="hw.certainty" value="0.75"/>
+    <param pos="0" name="os.vendor" value="Dell"/>
+    <param pos="0" name="os.product" value="iDRAC Linux"/>
+    <param pos="0" name="os .certainty" value="0.75"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Pulse Connect Secure - SSL">
+    <description>Pulse Secure VPN</description>
+    <example>Pulse Connect Secure - SSL</example>
+    <param pos="0" name="os.vendor" value="Pulse Secure"/>
+    <param pos="0" name="os.family" value="SSL-VPN"/>
+    <param pos="0" name="os.device" value="SSL-VPN"/>
+    <param pos="0" name="os.product" value="SSL-VPN"/>
+  </fingerprint>
+
+</fingerprints>