Merge pull request #3919 from Zyqsempai/add-io-metrics

Added IO metrics for cgroup v2

metrics/cgroups/v2/io.go

@@ -0,0 +1,110 @@
+// +build linux
+
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package v2
+
+import (
+	"strconv"
+
+	v2 "github.com/containerd/containerd/metrics/types/v2"
+	metrics "github.com/docker/go-metrics"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+var ioMetrics = []*metric{
+	{
+		name:   "io_rbytes",
+		help:   "IO bytes read",
+		unit:   metrics.Bytes,
+		vt:     prometheus.GaugeValue,
+		labels: []string{"major", "minor"},
+		getValues: func(stats *v2.Metrics) []value {
+			if stats.Io == nil {
+				return nil
+			}
+			var out []value
+			for _, e := range stats.Io.Usage {
+				out = append(out, value{
+					v: float64(e.Rbytes),
+					l: []string{strconv.FormatUint(e.Major, 10), strconv.FormatUint(e.Minor, 10)},
+				})
+			}
+			return out
+		},
+	},
+	{
+		name:   "io_wbytes",
+		help:   "IO bytes written",
+		unit:   metrics.Bytes,
+		vt:     prometheus.GaugeValue,
+		labels: []string{"major", "minor"},
+		getValues: func(stats *v2.Metrics) []value {
+			if stats.Io == nil {
+				return nil
+			}
+			var out []value
+			for _, e := range stats.Io.Usage {
+				out = append(out, value{
+					v: float64(e.Wbytes),
+					l: []string{strconv.FormatUint(e.Major, 10), strconv.FormatUint(e.Minor, 10)},
+				})
+			}
+			return out
+		},
+	},
+	{
+		name:   "io_rios",
+		help:   "Number of read IOs",
+		unit:   metrics.Total,
+		vt:     prometheus.GaugeValue,
+		labels: []string{"major", "minor"},
+		getValues: func(stats *v2.Metrics) []value {
+			if stats.Io == nil {
+				return nil
+			}
+			var out []value
+			for _, e := range stats.Io.Usage {
+				out = append(out, value{
+					v: float64(e.Rios),
+					l: []string{strconv.FormatUint(e.Major, 10), strconv.FormatUint(e.Minor, 10)},
+				})
+			}
+			return out
+		},
+	},
+	{
+		name:   "io_wios",
+		help:   "Number of write IOs",
+		unit:   metrics.Total,
+		vt:     prometheus.GaugeValue,
+		labels: []string{"major", "minor"},
+		getValues: func(stats *v2.Metrics) []value {
+			if stats.Io == nil {
+				return nil
+			}
+			var out []value
+			for _, e := range stats.Io.Usage {
+				out = append(out, value{
+					v: float64(e.Wios),
+					l: []string{strconv.FormatUint(e.Major, 10), strconv.FormatUint(e.Minor, 10)},
+				})
+			}
+			return out
+		},
+	},
+}

metrics/cgroups/v2/metrics.go

@@ -45,6 +45,7 @@ func newCollector(ns *metrics.Namespace) *collector {
 	c.metrics = append(c.metrics, pidMetrics...)
 	c.metrics = append(c.metrics, cpuMetrics...)
 	c.metrics = append(c.metrics, memoryMetrics...)
+	c.metrics = append(c.metrics, ioMetrics...)
 	c.storedMetrics = make(chan prometheus.Metric, 100*len(c.metrics))
 	ns.Add(c)
 	return c

metrics/types/v2/types.go

@@ -31,4 +31,6 @@ type (
 	CPUStat = v2.CPUStat
 	// PidsStat alias
 	PidsStat = v2.PidsStat
+	// IOStat alias
+	IOStat = v2.IOStat
 )