Update 'plugins/edirectory_monitor/agent_based/edirectory_monitor_dclient.py'

plugins/edirectory_monitor/agent_based/edirectory_monitor_dclient.py

@@ -32,14 +32,16 @@ from cmk_addons.plugins.edirectory_monitor.lib import (
     total_counter_attributes,
 )
 
+total_counters = [
+    "OutBoundContext_ActiveOutBoundContextCount",
+    "OutBoundContext_TotalOutBoundContextCount",
+]
 def check_edirectory_items(item: str, params: Mapping[str, Any], section) -> CheckResult:
     value_store = get_value_store()
     '''Split the item key and store the last part for making the returned result and/or metric more unique'''
     item_detail = item.split()[-1]
     data = section.get(item)
     warn, crit = params.get("levels", ("fixed", (None, None)))[1]
-    # The warn and crit you can use than later inside a check_levels function
-     # print(f"Levels - {warn} - {crit}")
     if not data:
         return
     for key, value in data.items():
@@ -61,10 +63,11 @@ def check_edirectory_items(item: str, params: Mapping[str, Any], section) -> Che
             '''create a default result if above criteria do not apply'''
             warn, crit = params.get((item.lower()).replace(" ", "_"), {}).get(key, ("fixed", (None, None)))[1]
             if warn is not None or crit is not None:
-                #print(f"Levels {key} - {warn} - {crit}")
                 if (item_detail + "_" + key) in total_counter_attributes:
                     previous_value = value_store.get(key, 0)
                     value_store[key] = value
+                    if (previous_value > value):
+                        previous_value = 0
                     value_difference = int(value) - int(previous_value)
                     yield from check_levels(
                         int(math.ceil(value_difference)),
@@ -72,7 +75,7 @@ def check_edirectory_items(item: str, params: Mapping[str, Any], section) -> Che
                         label=key,
                         metric_name=key,
                         notice_only=True,
-                        )
+                    )
                 else:
                     yield from check_levels(
                         int(value),
@@ -80,7 +83,7 @@ def check_edirectory_items(item: str, params: Mapping[str, Any], section) -> Che
                         label=key,
                         metric_name=key,
                         notice_only=True,
-                        )
+                    )
             else:
                 yield Result(state=State(0), notice=f"{key}: {value}", details=f"{key}: {value}")
         if (item_detail + "_" + key) in total_counter_attributes:
@@ -91,12 +94,12 @@ def check_edirectory_items(item: str, params: Mapping[str, Any], section) -> Che
             yield Metric((item_detail + "_" + key), abs(value_difference), boundaries=(0, None))
         elif (item_detail + "_" + key) not in non_graphable_attributes:
             '''Only create a metric for graphable values'''
-            yield Metric((item_detail + "_" + key), abs(int(value)))
+            yield Metric(key, abs(int(value)))
 
 agent_section_edirectory_monitor_dhost = AgentSection(
     name="edirectory_monitor_dclient",
     parse_function=parse_ldap_data,
-    )
+)
 
 check_plugin_edirectory_monitor_dclient = CheckPlugin(
     name="edirectory_monitor_dclient",