syntax update and added additional endpoints

default-logins/dell/dell-idrac-default-login.yaml

@@ -22,7 +22,6 @@ requests:
         status:
           - 200
 
-    matchers:
       - type: word
         words:
           - <authResult>0</authResult>

technologies/dell-idrac-detect.yaml

@@ -10,9 +10,35 @@ requests:
     headers:
       User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36
     path:
+      - "{{BaseURL}}/restgui/start.html"
+      - "{{BaseURL}}/sysmgmt/2015/bmc/info" # Firmware Version and other info (iDRAC9)
       - "{{BaseURL}}/login.html"
 
+    matchers-condition: and
     matchers:
+      - type: status
+        status:
+          - 200
       - type: word
+        part: body
         words:
-          - 'Integrated Dell Remote Access Controller'
+          - "Dell Integrated Remote Access Controller "
+          - "Integrated Dell Remote Access Controller"
+          - "iDRAC"
+          - "PowerEdge"
+
+    extractors:
+      - type: regex
+        part: header
+        regex:
+          - iDRAC/[0-9]{1,2}
+      - type: regex
+        part: body
+        regex:
+          - iDRAC[0-9]{1,2}
+      - type: regex
+        part: body
+        name: fwver
+        group: 1
+        regex:
+          - '"FwVer" *: *"([^"]+)"'