Merge pull request #190 from linkernetworks/phstsai/VX-225

[Task] VX-225: Refactor the prometheus
linkernetworks · Jul 30, 2018 · ea8ae45 · ea8ae45
2 parents 1d348b7 + 825d23e
commit ea8ae45
Show file tree

Hide file tree

Showing 9 changed files with 1,031 additions and 751 deletions.
diff --git a/src/entity/metrics_container.go b/src/entity/metrics_container.go
@@ -2,8 +2,8 @@ package entity
 
 // ContainerResourceMetrics is the sructure for Container Resource Metrics
 type ContainerResourceMetrics struct {
-	CPUUsagePercentage float32 `json:"cpuUsagePercentage"`
-	MemoryUsageBytes   float32 `json:"memoryUsageBytes"`
+	CPUUsagePercentage float32      `json:"cpuUsagePercentage"`
+	MemoryUsageBytes   []SamplePair `json:"memoryUsageBytes"`
 }
 
 // ContainerStatusMetrics is the sructure for Container Status Metrics

diff --git a/src/entity/metrics_node.go b/src/entity/metrics_node.go
@@ -1,5 +1,13 @@
 package entity
 
+import "github.com/prometheus/common/model"
+
+// SamplePair pairs a SampleValue with a Timestamp.
+type SamplePair struct {
+	Timestamp model.Time        `json:"timestamp"`
+	Value     model.SampleValue `json:"value"`
+}
+
 // NICNetworkTrafficMetrics is the structure for NIC metwork traffic metrics
 type NICNetworkTrafficMetrics struct {
 	ReceiveBytesTotal    int `json:"receiveBytesTotal"`