Merge pull request #35 from sentrysoftware/feature/issue-33-add-tags-…

…to-connectors Issue #33: Add tags to connectors
sentrysoftware · Feb 13, 2024 · 8e7f3ef · 8e7f3ef
2 parents a1b191b + 155c91c
commit 8e7f3ef
Show file tree

Hide file tree

Showing 34 changed files with 34 additions and 0 deletions.
diff --git a/src/main/connector/hardware/DiskPart/DiskPart.yaml b/src/main/connector/hardware/DiskPart/DiskPart.yaml
@@ -20,6 +20,7 @@ connector:
       commandLine: CHCP 437&&DISKPART.EXE /S ${file::exit.txt}
       expectedResult: Leaving DiskPart
       timeout: 120
+    tags: [ hardware ]
 monitors:
   logical_disk:
     discovery:

diff --git a/src/main/connector/hardware/GenBatteryNT/GenBatteryNT.yaml b/src/main/connector/hardware/GenBatteryNT/GenBatteryNT.yaml
@@ -22,6 +22,7 @@ connector:
     - type: wmi
       namespace: root\cimv2
       query: SELECT DeviceID FROM Win32_Battery
+    tags: [ hardware ]
 monitors:
   battery:
     discovery:

diff --git a/src/main/connector/hardware/GenericSwitchEnclosure/GenericSwitchEnclosure.yaml b/src/main/connector/hardware/GenericSwitchEnclosure/GenericSwitchEnclosure.yaml
@@ -16,6 +16,7 @@ connector:
     - Network
     supersedes:
     - MIB2
+    tags: [ hardware ]
 monitors:
   enclosure:
     discovery:

diff --git a/src/main/connector/hardware/GenericUPS/GenericUPS.yaml b/src/main/connector/hardware/GenericUPS/GenericUPS.yaml
@@ -14,6 +14,7 @@ connector:
     criteria:
     - type: snmpGetNext
       oid: 1.3.6.1.2.1.33
+    tags: [ hardware ]
 monitors:
   enclosure:
     discovery:

diff --git a/src/main/connector/hardware/HyperV/HyperV.yaml b/src/main/connector/hardware/HyperV/HyperV.yaml
@@ -19,6 +19,7 @@ connector:
     - type: osCommand
       commandLine: Powershell.exe Get-VM
       expectedResult: State
+    tags: [ hardware ]
 monitors:
   vm:
     discovery:

diff --git a/src/main/connector/hardware/IpmiTool/IpmiTool.yaml b/src/main/connector/hardware/IpmiTool/IpmiTool.yaml
@@ -20,6 +20,7 @@ connector:
     # Let the KM/PM validate whether IPMI is available or not
     - type: ipmi
       forceSerialization: true
+    tags: [ hardware ]
 monitors:
   enclosure:
     discovery:

diff --git a/src/main/connector/hardware/LibreHardwareMonitor/LibreHardwareMonitor.yaml b/src/main/connector/hardware/LibreHardwareMonitor/LibreHardwareMonitor.yaml
@@ -22,6 +22,7 @@ connector:
     - type: wmi
       query: SELECT Name FROM WMINET_InstrumentedAssembly
       namespace: root\LibreHardwareMonitor
+    tags: [ hardware ]
 monitors:
   enclosure:
     discovery:

diff --git a/src/main/connector/hardware/LinuxIPNetwork/LinuxIPNetwork.yaml b/src/main/connector/hardware/LinuxIPNetwork/LinuxIPNetwork.yaml
@@ -19,3 +19,4 @@ connector:
     - Linux
     supersedes:
     - LinuxIfConfigNetwork
+    tags: [ hardware ]
diff --git a/src/main/connector/hardware/LinuxIfConfigNetwork/LinuxIfConfigNetwork.yaml b/src/main/connector/hardware/LinuxIfConfigNetwork/LinuxIfConfigNetwork.yaml
@@ -17,3 +17,4 @@ connector:
     - local
     appliesTo:
     - Linux
+    tags: [ hardware ]
diff --git a/src/main/connector/hardware/LinuxMultipath/LinuxMultipath.yaml b/src/main/connector/hardware/LinuxMultipath/LinuxMultipath.yaml
@@ -22,6 +22,7 @@ connector:
     - type: osCommand
       commandLine: "%{SUDO:multipath} multipath -l"
       expectedResult: \(^\\_\)\|\(^\`\-\+\-\)
+    tags: [ hardware ]
 sudoCommands:
 - multipath
 monitors:

diff --git a/src/main/connector/hardware/LinuxNetwork-header/LinuxNetwork-header.yaml b/src/main/connector/hardware/LinuxNetwork-header/LinuxNetwork-header.yaml
@@ -11,6 +11,7 @@ connector:
     - type: osCommand
       commandLine: ${constant::GLOBAL_COMMAND_LINE}
       expectedResult: LOOPBACK
+    tags: [ hardware ]
 monitors:
   network:
     discovery:

diff --git a/src/main/connector/hardware/MIB2-header/MIB2-header.yaml b/src/main/connector/hardware/MIB2-header/MIB2-header.yaml
@@ -11,6 +11,7 @@ connector:
     # Criteria(1): there must be something in the ifTable SNMP Table
     - type: snmpGetNext
       oid: 1.3.6.1.2.1.2.2.1
+    tags: [ hardware ]
 monitors:
   network:
     discovery:

diff --git a/src/main/connector/hardware/MIB2/MIB2.yaml b/src/main/connector/hardware/MIB2/MIB2.yaml
@@ -15,6 +15,7 @@ connector:
     - OSF1
     supersedes:
     - HPUXNetwork
+    tags: [ hardware ]
 monitors:
   network:
     discovery:

diff --git a/src/main/connector/hardware/MIB2Linux/MIB2Linux.yaml b/src/main/connector/hardware/MIB2Linux/MIB2Linux.yaml
@@ -11,6 +11,7 @@ connector:
     supersedes:
     - LinuxIPNetwork
     - LinuxIfConfigNetwork
+    tags: [ hardware ]
 monitors:
   network:
     discovery:

diff --git a/src/main/connector/hardware/MIB2NT/MIB2NT.yaml b/src/main/connector/hardware/MIB2NT/MIB2NT.yaml
@@ -10,6 +10,7 @@ connector:
     - NT
     supersedes:
     - WBEMGenNetwork
+    tags: [ hardware ]
 monitors:
   network:
     discovery:

diff --git a/src/main/connector/hardware/MIB2Switch/MIB2Switch.yaml b/src/main/connector/hardware/MIB2Switch/MIB2Switch.yaml
@@ -21,6 +21,7 @@ connector:
     - Network
     supersedes:
     - GenericSwitchEnclosure
+    tags: [ hardware ]
 monitors:
   network:
     discovery:

diff --git a/src/main/connector/hardware/NvidiaSmi/NvidiaSmi.yaml b/src/main/connector/hardware/NvidiaSmi/NvidiaSmi.yaml
@@ -18,6 +18,7 @@ connector:
       commandLine: nvidia-smi
       expectedResult: Driver Version
       errorMessage: nvidia-smi not found at target host.
+    tags: [ hardware ]
 monitors:
   enclosure:
     discovery:

diff --git a/src/main/connector/hardware/VMwareESX4i/VMwareESX4i.yaml b/src/main/connector/hardware/VMwareESX4i/VMwareESX4i.yaml
@@ -24,3 +24,4 @@ connector:
       namespace: root/cimv2
       query: SELECT MajorVersion FROM VMware_HypervisorSoftwareIdentity
       expectedResult: "^[1-9][0-9]\\|[4-9]"
+    tags: [ hardware ]
diff --git a/src/main/connector/hardware/VMwareESX5iLUN-header/VMwareESX5iLUN-header.yaml b/src/main/connector/hardware/VMwareESX5iLUN-header/VMwareESX5iLUN-header.yaml
@@ -11,6 +11,7 @@ connector:
       commandLine: ${constant::_EsxcliConstant} storage core path list
       expectedResult: "Transport: fc"
       executeLocally: ${constant::_ExecuteLocally}
+    tags: [ hardware ]
 monitors:
   lun:
     discovery:

diff --git a/src/main/connector/hardware/VMwareESX5iLUNSSH/VMwareESX5iLUNSSH.yaml b/src/main/connector/hardware/VMwareESX5iLUNSSH/VMwareESX5iLUNSSH.yaml
@@ -18,3 +18,4 @@ connector:
     appliesTo:
     - Linux
     - OOB
+    tags: [ hardware ]
diff --git a/src/main/connector/hardware/VMwareESX5iLUNesxcli/VMwareESX5iLUNesxcli.yaml b/src/main/connector/hardware/VMwareESX5iLUNesxcli/VMwareESX5iLUNesxcli.yaml
@@ -14,6 +14,7 @@ connector:
     appliesTo:
     - Linux
     - OOB
+    tags: [ hardware ]
   displayName: VMware ESXi 5 LUN (esxcli)
   platforms: VMware ESXi
   reliesOn: ESX excli utility (installed locally on the agent host)

diff --git a/src/main/connector/hardware/VMwareESXVMSNMP/VMwareESXVMSNMP.yaml b/src/main/connector/hardware/VMwareESXVMSNMP/VMwareESXVMSNMP.yaml
@@ -19,6 +19,7 @@ connector:
     # Checking if we have VM
     - type: snmpGetNext
       oid: 1.3.6.1.4.1.6876.2.1.1
+    tags: [ hardware ]
 monitors:
   vm:
     discovery:

diff --git a/src/main/connector/hardware/VMwareESXi/VMwareESXi.yaml b/src/main/connector/hardware/VMwareESXi/VMwareESXi.yaml
@@ -23,3 +23,4 @@ connector:
       namespace: root/cimv2
       query: SELECT MajorVersion FROM VMware_HypervisorSoftwareIdentity
       expectedResult: ^3
+    tags: [ hardware ]
diff --git a/src/main/connector/hardware/VMwareESXiDisksIPMI/VMwareESXiDisksIPMI.yaml b/src/main/connector/hardware/VMwareESXiDisksIPMI/VMwareESXiDisksIPMI.yaml
@@ -25,6 +25,7 @@ connector:
       namespace: root/cimv2
       query: SELECT IpmiSensorType,SensorType,CurrentState FROM OMC_DiscreteSensor
       expectedResult: ^13;11;Assert;
+    tags: [ hardware ]
 monitors:
   physical_disk:
     discovery:

diff --git a/src/main/connector/hardware/VMwareESXiDisksStorage/VMwareESXiDisksStorage.yaml b/src/main/connector/hardware/VMwareESXiDisksStorage/VMwareESXiDisksStorage.yaml
@@ -26,6 +26,7 @@ connector:
     - type: wbem
       namespace: root/cimv2
       query: SELECT DeviceID,Caption,NumberOfBlocks,BlockSize FROM VMware_StorageExtent
+    tags: [ hardware ]
 monitors:
   disk_controller:
     discovery:

diff --git a/src/main/connector/hardware/Virsh/Virsh.yaml b/src/main/connector/hardware/Virsh/Virsh.yaml
@@ -19,6 +19,7 @@ connector:
     - type: osCommand
       commandLine: virsh list
       expectedResult: Name
+    tags: [ hardware ]
 monitors:
   vm:
     discovery:

diff --git a/src/main/connector/hardware/WBEMGenDiskNT/WBEMGenDiskNT.yaml b/src/main/connector/hardware/WBEMGenDiskNT/WBEMGenDiskNT.yaml
@@ -23,6 +23,7 @@ connector:
       namespace: root\WMI
       query: SELECT InstanceName FROM MSStorageDriver_FailurePredictStatus WHERE Active=TRUE
       expectedResult: "\\(^[^M]...\\)\\|\\(^.[^P]..\\)\\|\\(^..[^I].\\)\\|\\(^...[^O]\\)"
+    tags: [ hardware ]
 monitors:
   disk_controller:
     discovery:

diff --git a/src/main/connector/hardware/WBEMGenHBA/WBEMGenHBA.yaml b/src/main/connector/hardware/WBEMGenHBA/WBEMGenHBA.yaml
@@ -28,6 +28,7 @@ connector:
     - type: wmi
       query: SELECT InstanceName FROM MSFC_FCAdapterHBAAttributes
       namespace: root\wmi
+    tags: [ hardware ]
 monitors:
   network:
     discovery:

diff --git a/src/main/connector/hardware/WBEMGenLUN/WBEMGenLUN.yaml b/src/main/connector/hardware/WBEMGenLUN/WBEMGenLUN.yaml
@@ -26,6 +26,7 @@ connector:
       query: SELECT NumberDrives,DriveInfo.Name FROM MPIO_DISK_INFO
       namespace: root\wmi
       expectedResult: "^[1-9][0-9]*;[^;].*;$"
+    tags: [ hardware ]
 monitors:
   lun:
     discovery:

diff --git a/src/main/connector/hardware/WBEMGenNetwork/WBEMGenNetwork.yaml b/src/main/connector/hardware/WBEMGenNetwork/WBEMGenNetwork.yaml
@@ -30,6 +30,7 @@ connector:
       query: SELECT AdapterType FROM Win32_NetworkAdapter
       namespace: root\cimv2
       expectedResult: ^Ethernet 802\.3;$
+    tags: [ hardware ]
 monitors:
   network:
     discovery:

diff --git a/src/main/connector/hardware/WinStorageSpaces/WinStorageSpaces.yaml b/src/main/connector/hardware/WinStorageSpaces/WinStorageSpaces.yaml
@@ -28,6 +28,7 @@ connector:
     - type: wmi
       namespace: root\Microsoft\Windows\Storage
       query: SELECT ObjectId FROM MSFT_Volume
+    tags: [ hardware ]
 monitors:
   disk_controller:
     discovery:

diff --git a/src/main/connector/hardware/lmsensors/lmsensors.yaml b/src/main/connector/hardware/lmsensors/lmsensors.yaml
@@ -21,6 +21,7 @@ connector:
       commandLine: "%{SUDO:/usr/bin/sensors} /usr/bin/sensors -h"
       expectedResult: "Usage: sensors "
       errorMessage: lm_sensors is not installed on this server.
+    tags: [ hardware ]
 sudoCommands:
 - /usr/sbin/dmidecode
 - /usr/bin/sensors

diff --git a/src/main/connector/system/Linux/Linux.yaml b/src/main/connector/system/Linux/Linux.yaml
@@ -24,6 +24,7 @@ connector:
       commandLine: /usr/bin/uname -o
       expectedResult: GNU/Linux
       errorMessage: Not a valid Linux host.
+    tags: [ system ]
 monitors:
   cpu:
     simple:

diff --git a/src/main/connector/system/Windows/Windows.yaml b/src/main/connector/system/Windows/Windows.yaml
@@ -28,6 +28,7 @@ connector:
     - type: wmi
       namespace: root\CIMv2
       query: SELECT * FROM Win32_OperatingSystem
+    tags: [ system ]
 monitors:
   cpu:
     simple:
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,3 +17,4 @@ connector: @@
         - local
         appliesTo:
         - Linux
+        tags: [ hardware ]