Commit 62beda97 authored by David Enyeart's avatar David Enyeart Committed by Gerrit Code Review
Browse files

Merge "FAB-11863 Assorted Raft serviceability fixes" into release-1.4

parents d568cc02 5fb1be95
...@@ -48,26 +48,26 @@ The following metrics are currently exported for consumption by Prometheus. ...@@ -48,26 +48,26 @@ The following metrics are currently exported for consumption by Prometheus.
| | | | channel | | | | | channel |
| | | | chaincode | | | | | chaincode |
+-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+ +-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+
| cluster_comm_egress_queue_capacity | gauge | Capacity of the egress queue | host | | cluster_comm_egress_queue_capacity | gauge | Capacity of the egress queue. | host |
| | | | msg_type | | | | | msg_type |
| | | | channel | | | | | channel |
+-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+ +-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+
| cluster_comm_egress_queue_length | gauge | Length of the egress queue | host | | cluster_comm_egress_queue_length | gauge | Length of the egress queue. | host |
| | | | msg_type | | | | | msg_type |
| | | | channel | | | | | channel |
+-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+ +-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+
| cluster_comm_egress_queue_workers | gauge | Count of egress queue workers | channel | | cluster_comm_egress_queue_workers | gauge | Count of egress queue workers. | channel |
+-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+ +-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+
| cluster_comm_egress_stream_count | gauge | Count of streams to other nodes | channel | | cluster_comm_egress_stream_count | gauge | Count of streams to other nodes. | channel |
+-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+ +-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+
| cluster_comm_egress_tls_connection_count | gauge | Count of TLS connections to other nodes | | | cluster_comm_egress_tls_connection_count | gauge | Count of TLS connections to other nodes. | |
+-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+ +-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+
| cluster_comm_ingress_stream_count | gauge | Count of streams from other nodes | | | cluster_comm_ingress_stream_count | gauge | Count of streams from other nodes. | |
+-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+ +-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+
| cluster_comm_msg_dropped_count | counter | Count of messages dropped | host | | cluster_comm_msg_dropped_count | counter | Count of messages dropped. | host |
| | | | channel | | | | | channel |
+-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+ +-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+
| cluster_comm_msg_send_time | histogram | Time it takes to send a message down the stream | host | | cluster_comm_msg_send_time | histogram | The time it takes to send a message in seconds. | host |
| | | | channel | | | | | channel |
+-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+ +-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+
| consensus_etcdraft_cluster_size | gauge | Number of nodes in this channel. | channel | | consensus_etcdraft_cluster_size | gauge | Number of nodes in this channel. | channel |
...@@ -83,7 +83,7 @@ The following metrics are currently exported for consumption by Prometheus. ...@@ -83,7 +83,7 @@ The following metrics are currently exported for consumption by Prometheus.
| consensus_etcdraft_is_leader | gauge | The leadership status of the current node: 1 if it is the | channel | | consensus_etcdraft_is_leader | gauge | The leadership status of the current node: 1 if it is the | channel |
| | | leader else 0. | | | | | leader else 0. | |
+-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+ +-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+
| consensus_etcdraft_leader_changes | counter | The number of leader changes. | channel | | consensus_etcdraft_leader_changes | counter | The number of leader changes since process start. | channel |
+-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+ +-----------------------------------------------------+-----------+------------------------------------------------------------+--------------------+
| consensus_etcdraft_normal_proposals_received | counter | The total number of proposals received for normal type | channel | | consensus_etcdraft_normal_proposals_received | counter | The total number of proposals received for normal type | channel |
| | | transactions. | | | | | transactions. | |
...@@ -256,21 +256,21 @@ associated with the metric. ...@@ -256,21 +256,21 @@ associated with the metric.
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| chaincode.shim_requests_received.%{type}.%{channel}.%{chaincode} | counter | The number of chaincode shim requests received. | | chaincode.shim_requests_received.%{type}.%{channel}.%{chaincode} | counter | The number of chaincode shim requests received. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| cluster.comm.egress_queue_capacity.%{host}.%{msg_type}.%{channel} | gauge | Capacity of the egress queue | | cluster.comm.egress_queue_capacity.%{host}.%{msg_type}.%{channel} | gauge | Capacity of the egress queue. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| cluster.comm.egress_queue_length.%{host}.%{msg_type}.%{channel} | gauge | Length of the egress queue | | cluster.comm.egress_queue_length.%{host}.%{msg_type}.%{channel} | gauge | Length of the egress queue. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| cluster.comm.egress_queue_workers.%{channel} | gauge | Count of egress queue workers | | cluster.comm.egress_queue_workers.%{channel} | gauge | Count of egress queue workers. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| cluster.comm.egress_stream_count.%{channel} | gauge | Count of streams to other nodes | | cluster.comm.egress_stream_count.%{channel} | gauge | Count of streams to other nodes. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| cluster.comm.egress_tls_connection_count | gauge | Count of TLS connections to other nodes | | cluster.comm.egress_tls_connection_count | gauge | Count of TLS connections to other nodes. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| cluster.comm.ingress_stream_count | gauge | Count of streams from other nodes | | cluster.comm.ingress_stream_count | gauge | Count of streams from other nodes. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| cluster.comm.msg_dropped_count.%{host}.%{channel} | counter | Count of messages dropped | | cluster.comm.msg_dropped_count.%{host}.%{channel} | counter | Count of messages dropped. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| cluster.comm.msg_send_time.%{host}.%{channel} | histogram | Time it takes to send a message down the stream | | cluster.comm.msg_send_time.%{host}.%{channel} | histogram | The time it takes to send a message in seconds. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| consensus.etcdraft.cluster_size.%{channel} | gauge | Number of nodes in this channel. | | consensus.etcdraft.cluster_size.%{channel} | gauge | Number of nodes in this channel. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
...@@ -285,7 +285,7 @@ associated with the metric. ...@@ -285,7 +285,7 @@ associated with the metric.
| consensus.etcdraft.is_leader.%{channel} | gauge | The leadership status of the current node: 1 if it is the | | consensus.etcdraft.is_leader.%{channel} | gauge | The leadership status of the current node: 1 if it is the |
| | | leader else 0. | | | | leader else 0. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| consensus.etcdraft.leader_changes.%{channel} | counter | The number of leader changes. | | consensus.etcdraft.leader_changes.%{channel} | counter | The number of leader changes since process start. |
+-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+ +-----------------------------------------------------------------------------------------+-----------+------------------------------------------------------------+
| consensus.etcdraft.normal_proposals_received.%{channel} | counter | The total number of proposals received for normal type | | consensus.etcdraft.normal_proposals_received.%{channel} | counter | The total number of proposals received for normal type |
| | | transactions. | | | | transactions. |
......
...@@ -58,7 +58,7 @@ type RemoteNode struct { ...@@ -58,7 +58,7 @@ type RemoteNode struct {
// String returns a string representation of this RemoteNode // String returns a string representation of this RemoteNode
func (rm RemoteNode) String() string { func (rm RemoteNode) String() string {
return fmt.Sprintf("ID: %d\nEndpoint: %s\nServerTLSCert:%s ClientTLSCert:%s", return fmt.Sprintf("ID: %d,\nEndpoint: %s,\nServerTLSCert:%s, ClientTLSCert:%s",
rm.ID, rm.Endpoint, DERtoPEM(rm.ServerTLSCert), DERtoPEM(rm.ClientTLSCert)) rm.ID, rm.Endpoint, DERtoPEM(rm.ServerTLSCert), DERtoPEM(rm.ClientTLSCert))
} }
......
...@@ -17,7 +17,7 @@ var ( ...@@ -17,7 +17,7 @@ var (
Namespace: "cluster", Namespace: "cluster",
Subsystem: "comm", Subsystem: "comm",
Name: "egress_queue_length", Name: "egress_queue_length",
Help: "Length of the egress queue", Help: "Length of the egress queue.",
LabelNames: []string{"host", "msg_type", "channel"}, LabelNames: []string{"host", "msg_type", "channel"},
StatsdFormat: "%{#fqname}.%{host}.%{msg_type}.%{channel}", StatsdFormat: "%{#fqname}.%{host}.%{msg_type}.%{channel}",
} }
...@@ -26,7 +26,7 @@ var ( ...@@ -26,7 +26,7 @@ var (
Namespace: "cluster", Namespace: "cluster",
Subsystem: "comm", Subsystem: "comm",
Name: "egress_queue_capacity", Name: "egress_queue_capacity",
Help: "Capacity of the egress queue", Help: "Capacity of the egress queue.",
LabelNames: []string{"host", "msg_type", "channel"}, LabelNames: []string{"host", "msg_type", "channel"},
StatsdFormat: "%{#fqname}.%{host}.%{msg_type}.%{channel}", StatsdFormat: "%{#fqname}.%{host}.%{msg_type}.%{channel}",
} }
...@@ -35,7 +35,7 @@ var ( ...@@ -35,7 +35,7 @@ var (
Namespace: "cluster", Namespace: "cluster",
Subsystem: "comm", Subsystem: "comm",
Name: "egress_queue_workers", Name: "egress_queue_workers",
Help: "Count of egress queue workers", Help: "Count of egress queue workers.",
LabelNames: []string{"channel"}, LabelNames: []string{"channel"},
StatsdFormat: "%{#fqname}.%{channel}", StatsdFormat: "%{#fqname}.%{channel}",
} }
...@@ -44,7 +44,7 @@ var ( ...@@ -44,7 +44,7 @@ var (
Namespace: "cluster", Namespace: "cluster",
Subsystem: "comm", Subsystem: "comm",
Name: "ingress_stream_count", Name: "ingress_stream_count",
Help: "Count of streams from other nodes", Help: "Count of streams from other nodes.",
StatsdFormat: "%{#fqname}", StatsdFormat: "%{#fqname}",
} }
...@@ -52,7 +52,7 @@ var ( ...@@ -52,7 +52,7 @@ var (
Namespace: "cluster", Namespace: "cluster",
Subsystem: "comm", Subsystem: "comm",
Name: "egress_stream_count", Name: "egress_stream_count",
Help: "Count of streams to other nodes", Help: "Count of streams to other nodes.",
LabelNames: []string{"channel"}, LabelNames: []string{"channel"},
StatsdFormat: "%{#fqname}.%{channel}", StatsdFormat: "%{#fqname}.%{channel}",
} }
...@@ -61,7 +61,7 @@ var ( ...@@ -61,7 +61,7 @@ var (
Namespace: "cluster", Namespace: "cluster",
Subsystem: "comm", Subsystem: "comm",
Name: "egress_tls_connection_count", Name: "egress_tls_connection_count",
Help: "Count of TLS connections to other nodes", Help: "Count of TLS connections to other nodes.",
StatsdFormat: "%{#fqname}", StatsdFormat: "%{#fqname}",
} }
...@@ -69,7 +69,7 @@ var ( ...@@ -69,7 +69,7 @@ var (
Namespace: "cluster", Namespace: "cluster",
Subsystem: "comm", Subsystem: "comm",
Name: "msg_send_time", Name: "msg_send_time",
Help: "Time it takes to send a message down the stream", Help: "The time it takes to send a message in seconds.",
LabelNames: []string{"host", "channel"}, LabelNames: []string{"host", "channel"},
StatsdFormat: "%{#fqname}.%{host}.%{channel}", StatsdFormat: "%{#fqname}.%{host}.%{channel}",
} }
...@@ -78,7 +78,7 @@ var ( ...@@ -78,7 +78,7 @@ var (
Namespace: "cluster", Namespace: "cluster",
Subsystem: "comm", Subsystem: "comm",
Name: "msg_dropped_count", Name: "msg_dropped_count",
Help: "Count of messages dropped", Help: "Count of messages dropped.",
LabelNames: []string{"host", "channel"}, LabelNames: []string{"host", "channel"},
StatsdFormat: "%{#fqname}.%{host}.%{channel}", StatsdFormat: "%{#fqname}.%{host}.%{channel}",
} }
...@@ -137,7 +137,7 @@ func (m *Metrics) reportWorkerCount(channel string, count uint32) { ...@@ -137,7 +137,7 @@ func (m *Metrics) reportWorkerCount(channel string, count uint32) {
} }
func (m *Metrics) reportMsgSendTime(host string, channel string, duration time.Duration) { func (m *Metrics) reportMsgSendTime(host string, channel string, duration time.Duration) {
m.MessageSendTime.With("host", host, "channel", channel).Observe(float64(duration)) m.MessageSendTime.With("host", host, "channel", channel).Observe(float64(duration.Seconds()))
} }
func (m *Metrics) reportEgressStreamCount(channel string, count uint32) { func (m *Metrics) reportEgressStreamCount(channel string, count uint32) {
......
...@@ -45,7 +45,7 @@ var ( ...@@ -45,7 +45,7 @@ var (
Namespace: "consensus", Namespace: "consensus",
Subsystem: "etcdraft", Subsystem: "etcdraft",
Name: "leader_changes", Name: "leader_changes",
Help: "The number of leader changes.", Help: "The number of leader changes since process start.",
LabelNames: []string{"channel"}, LabelNames: []string{"channel"},
StatsdFormat: "%{#fqname}.%{channel}", StatsdFormat: "%{#fqname}.%{channel}",
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment