Merge pull request #1051 from yadzhang/dev/zram_metrics

feat(metrics): add zram metrics collection and processing

Author: xu282934741

pkg/consts/metric.go

@@ -220,6 +220,13 @@ const (
 	MetricCPUCodeName = "cpu.code.name"
 )
 
+// System zram metrics
+const (
+	MetricZramUsedTotal      = "zram.used.total.system"
+	MetricZramComprDataSize  = "zram.compr.usage.system"
+	MetricZramOriginDataSize = "zram.origin.usage.system"
+)
+
 // container cpu metrics
 const (
 	MetricCPULimitContainer      = "cpu.limit.container"

pkg/metaserver/agent/metric/provisioner/malachite/client/client_system.go

@@ -85,13 +85,13 @@ func (c *MalachiteClient) GetSystemMemoryStats() (*types.SystemMemoryData, error
 	return &rsp.Data, nil
 }
 
-func (c *MalachiteClient) GetSystemIOStats() (*types.SystemDiskIoData, error) {
+func (c *MalachiteClient) GetSystemIOStats() (*types.SystemIoData, error) {
 	statsData, err := c.getSystemStats(IO)
 	if err != nil {
 		return nil, err
 	}
 
-	rsp := &types.MalachiteSystemDiskIoResponse{}
+	rsp := &types.MalachiteSystemIoResponse{}
 	if err := json.Unmarshal(statsData, rsp); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal system io stats raw data, err %s", err)
 	}

pkg/metaserver/agent/metric/provisioner/malachite/client/client_system_test.go

@@ -60,9 +60,9 @@ var (
 		},
 	}
 
-	fakeSystemIO = &types.MalachiteSystemDiskIoResponse{
+	fakeSystemIO = &types.MalachiteSystemIoResponse{
 		Status: 0,
-		Data: types.SystemDiskIoData{
+		Data: types.SystemIoData{
 			DiskIo: []types.DiskIo{
 				{},
 			},

pkg/metaserver/agent/metric/provisioner/malachite/provisioner.go

@@ -382,7 +382,7 @@ func (m *MalachiteMetricsProvisioner) processSystemMemoryData(systemMemoryData *
 		utilmetric.MetricData{Value: float64(mem.MemSockUdpLimit), Time: &updateTime})
 }
 
-func (m *MalachiteMetricsProvisioner) processSystemIOData(systemIOData *malachitetypes.SystemDiskIoData) {
+func (m *MalachiteMetricsProvisioner) processSystemIOData(systemIOData *malachitetypes.SystemIoData) {
 	if systemIOData == nil {
 		return
 	}
@@ -443,6 +443,17 @@ func (m *MalachiteMetricsProvisioner) processSystemIOData(systemIOData *malachit
 		m.metricStore.SetDeviceMetric(device.DeviceName, consts.MetricIODiskWBTValue,
 			utilmetric.MetricData{Value: float64(device.WBTValue), Time: &updateTime})
 	}
+
+	var zramOrigin, zramUsedTotal, zramCompr uint64
+	for _, stat := range systemIOData.ZramStat {
+		zramOrigin += stat.OrigDataSize
+		zramUsedTotal += stat.MemUsedTotal
+		zramCompr += stat.ComprDataSize
+	}
+
+	m.metricStore.SetNodeMetric(consts.MetricZramOriginDataSize, utilmetric.MetricData{Value: float64(zramOrigin), Time: &updateTime})
+	m.metricStore.SetNodeMetric(consts.MetricZramUsedTotal, utilmetric.MetricData{Value: float64(zramUsedTotal), Time: &updateTime})
+	m.metricStore.SetNodeMetric(consts.MetricZramComprDataSize, utilmetric.MetricData{Value: float64(zramCompr), Time: &updateTime})
 }
 
 func (m *MalachiteMetricsProvisioner) processSystemNetData(systemNetData *malachitetypes.SystemNetworkData) {

pkg/metaserver/agent/metric/provisioner/malachite/provisioner_test.go

@@ -69,7 +69,7 @@ func Test_noneExistMetricsProvisioner(t *testing.T) {
 			{},
 		},
 	}
-	fakeSystemIO := &malachitetypes.SystemDiskIoData{
+	fakeSystemIO := &malachitetypes.SystemIoData{
 		DiskIo: []malachitetypes.DiskIo{
 			{
 				PrimaryDeviceID:   8,
@@ -100,6 +100,14 @@ func Test_noneExistMetricsProvisioner(t *testing.T) {
 				WBTValue:          75234,
 			},
 		},
+		ZramStat: []malachitetypes.ZramStat{
+			{
+				Name:          "zram0",
+				ComprDataSize: 1073741824,
+				OrigDataSize:  2147483648,
+				MemUsedTotal:  1077936128,
+			},
+		},
 	}
 	fakeSystemNet := &malachitetypes.SystemNetworkData{
 		TCP: malachitetypes.TCP{},

pkg/metaserver/agent/metric/provisioner/malachite/types/system.go

@@ -16,9 +16,9 @@ limitations under the License.
 
 package types
 
-type MalachiteSystemDiskIoResponse struct {
-	Status int              `json:"status"`
-	Data   SystemDiskIoData `json:"data"`
+type MalachiteSystemIoResponse struct {
+	Status int          `json:"status"`
+	Data   SystemIoData `json:"data"`
 }
 
 type DiskIo struct {
@@ -38,9 +38,17 @@ type DiskIo struct {
 	IoWriteLat80      uint64 `json:"io_w_lat_80"`
 }
 
-type SystemDiskIoData struct {
-	DiskIo     []DiskIo `json:"disk_io"`
-	UpdateTime int64    `json:"update_time"`
+type SystemIoData struct {
+	DiskIo     []DiskIo   `json:"disk_io"`
+	ZramStat   []ZramStat `json:"zram_stat"`
+	UpdateTime int64      `json:"update_time"`
+}
+
+type ZramStat struct {
+	Name          string `json:"name"`
+	OrigDataSize  uint64 `json:"orig_data_size"`
+	ComprDataSize uint64 `json:"compr_data_size"`
+	MemUsedTotal  uint64 `json:"mem_used_total"`
 }
 
 type MalachiteSystemNetworkResponse struct {