Merge remote-tracking branch 'upstream/master'

Author: NanuIjaz

cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs

@@ -276,7 +276,7 @@ instance ( Show (BlockNodeToNodeVersion blk)
                ]
 
   asMetrics (BlockForgingUpdate b) =
-    [ IntM "can_forge_blocks"
+    [ IntM "forging_enabled"
       (case  b of
         EnabledBlockForging -> 1
         DisabledBlockForging -> 0
@@ -405,7 +405,8 @@ instance MetaTrace  (StartupTrace blk) where
   documentFor _ns = Nothing
 
   metricsDocFor (Namespace _ ["BlockForgingUpdate"]) =
-    [("can_forge_blocks","Can this node forging blocks (is it provided with block forging credentials) 0 = no, 1 = yes")]
+    [("forging_enabled","Can this node forge blocks? (Is it provided with block forging credentials) 0 = no, 1 = yes")]
+
 
   metricsDocFor _ = []
 

cardano-node/src/Cardano/Tracing/Tracers.hs

@@ -354,7 +354,7 @@ mkTracers blockConfig tOpts@(TracingOnLegacy trSel) tr nodeKern ekgDirect enable
       case mbEKGDirect of
         Just ekgDirect' ->
           case ev of
-              BlockForgingUpdate b -> sendEKGDirectInt ekgDirect' "can_forge_blocks"
+              BlockForgingUpdate b -> sendEKGDirectInt ekgDirect' "forging_enabled"
                                         (case b of
                                             EnabledBlockForging -> 1 :: Int
                                             DisabledBlockForging -> 0 :: Int