Update 'plugins/edirectory_monitor/graphing/metrics.py'

plugins/edirectory_monitor/graphing/metrics.py

@@ -10,30 +10,44 @@ from cmk.graphing.v1.graphs import Graph
 
 # Metrics for DHOST ThreadPool
 metric_threadmaxwaittime = metrics.Metric(
-    name="ThreadMaxWaitTime",
+    name="Threadpool_ThreadMaxWaitTime",
     title=Title("Maximum thread wait time before getting scheduled"),
     unit=metrics.Unit(metrics.TimeNotation()),
     color=metrics.Color.BROWN,
 )
 
+metric_threadminwaittime = metrics.Metric(
+    name="Threadpool_ThreadMinWaitTime",
+    title=Title("Minimum thread wait time before getting scheduled"),
+    unit=metrics.Unit(metrics.TimeNotation()),
+    color=metrics.Color.BLUE,
+)
+
+metric_threadreadyqueuemaxwaittime = metrics.Metric(
+    name="Threadpool_ThreadPoolReadyQueueMacWaitTime",
+    title=Title("Maximum thread wait time for queue"),
+    unit=metrics.Unit(metrics.TimeNotation()),
+    color=metrics.Color.CYAN,
+)
+
 # Metric for DClient
 metric_maxoutboundconnection = metrics.Metric(
     name="MaxOutBoundConnection",
     title=Title("DClient Maximum outbound connection count"),
-    unit=metrics.Unit(metrics.DecimalNotation("count")),
+    unit=metrics.Unit(metrics.DecimalNotation("")),
     color=metrics.Color.BROWN,
 )
 
 # Metrics for LDAP traffic
 metric_inbytes = metrics.Metric(
-    name="TrafficVolume_inBytes",
+    name="inBytes",
     title=Title("LDAP traffic bytes in"),
     unit=metrics.Unit(metrics.IECNotation("bytes")),
     color=metrics.Color.BROWN,
 )
 
 metric_outbytes = metrics.Metric(
-    name="TrafficVolume_outBytes",
+    name="outBytes",
     title=Title("LDAP traffic bytes Out"),
     unit=metrics.Unit(metrics.IECNotation("bytes")),
     color=metrics.Color.BLUE,
@@ -43,7 +57,7 @@ metric_outbytes = metrics.Metric(
 graph_ldaptraffic_combined = Graph(
     name = "ldap_traffic",
     title = Title("LDAP traffic totals"),
-    compound_lines=[ "TrafficVolume_inBytes", "TrafficVolume_outBytes" ],
+    compound_lines=[ "inBytes", "outBytes" ],
 )
 
 # Metric for Partition Agent
@@ -54,6 +68,28 @@ metric_maxringdelta = metrics.Metric(
     color=metrics.Color.BROWN,
 )
 
+# Metrics for RecordManager Cachestatistics
+metric_blockcachesize = metrics.Metric(
+    name="BlockCacheSize",
+    title=Title("Maximum Block Cache Size"),
+    unit=metrics.Unit(metrics.IECNotation("bytes")),
+    color=metrics.Color.DARK_BLUE,
+)
+
+metric_entrycachesize = metrics.Metric(
+    name="EntryCacheSize",
+    title=Title("Maximum Entry Cache Size"),
+    unit=metrics.Unit(metrics.IECNotation("bytes")),
+    color=metrics.Color.DARK_CYAN,
+)
+
+metric_totalcachesize = metrics.Metric(
+    name="TotalSize",
+    title=Title("Maximum Total Cache Size"),
+    unit=metrics.Unit(metrics.IECNotation("bytes")),
+    color=metrics.Color.DARK_GREEN,
+)
+
 # Metrics for RecordManager Size
 metric_dibfilesize = metrics.Metric(
     name="Size_DIBFileSize",
@@ -87,5 +123,5 @@ metric_totaldibsize = metrics.Metric(
     name="Size_TotalDIBSize",
     title=Title("Total FLAIM database size"),
     unit=metrics.Unit(metrics.IECNotation("bytes")),
-    color=metrics.Color.DARK_BROWN,
+    color=metrics.Color.DARK_CYAN,
 )