|
|
@@ -39,6 +39,13 @@ non_graphable_attributes = [
|
|
|
"CheckPointThreadData_CheckPointThreadForceStartTime",
|
|
|
"CheckPointThreadData_CheckPointThreadIsForced",
|
|
|
"Size_CurrentTransactionID",
|
|
|
+ "EngineVersion_EngineVersion",
|
|
|
+ "driverSet_Stats_driverSetDN",
|
|
|
+ "Driver_startOption",
|
|
|
+ "Driver_type",
|
|
|
+ "Driver_uptime",
|
|
|
+ "Driver_driver-state",
|
|
|
+ "Driver_DriverDN",
|
|
|
]
|
|
|
|
|
|
total_counter_attributes = [
|
|
|
@@ -82,7 +89,7 @@ def format_partition_agent(value):
|
|
|
|
|
|
def format_partition_data(value):
|
|
|
"""strip unwanted data from Agent Partition data"""
|
|
|
- formatted = re.sub('CN=|OU=|O=', '', value).replace(',', '.')
|
|
|
+ formatted = (re.sub('CN=|OU=|O=', '', value).replace(',', '.')).split("=")
|
|
|
return formatted
|
|
|
|
|
|
def convert_timestamp(value):
|
|
|
@@ -104,11 +111,14 @@ def parse_ldap_data(string_table):
|
|
|
if item == "Agent Partition":
|
|
|
key, value=format_partition_agent(data)
|
|
|
else:
|
|
|
- key, value=data.split("=")
|
|
|
+ #key, value=data.split("=")
|
|
|
+ key, value=format_partition_data(data)
|
|
|
parsed[item].setdefault(key, value)
|
|
|
return parsed
|
|
|
|
|
|
def discover_edirectory_items(section) -> DiscoveryResult:
|
|
|
'''discover one item per key'''
|
|
|
for key, data in section.items():
|
|
|
- yield Service(item=key)
|
|
|
+ print(key.strip())
|
|
|
+ if len(key) != 0:
|
|
|
+ yield Service(item=key)
|
