Merge pull request #1541 from andyxning/add_rss_and_cache

add rss and cache

Author: DirectXMan12

docs/storage-schema.md

@@ -26,6 +26,8 @@ Heapster exports the following metrics to its backends.
 | memory/page_faults_rate | Number of page faults per second. |
 | memory/request | Memory request (the guaranteed amount of resources) in bytes. |
 | memory/usage | Total memory usage. |
+| memory/cache | Cache memory usage. |
+| memory/rss | RSS memory usage. |
 | memory/working_set | Total working set usage. Working set is the memory being used and not easily dropped by the kernel. |
 | network/rx | Cumulative number of bytes received over the network. |
 | network/rx_errors | Cumulative number of errors while receiving over the network. |

metrics/core/metrics.go

@@ -29,6 +29,8 @@ var StandardMetrics = []Metric{
 	MetricUptime,
 	MetricCpuUsage,
 	MetricMemoryUsage,
+	MetricMemoryRSS,
+	MetricMemoryCache,
 	MetricMemoryWorkingSet,
 	MetricMemoryPageFaults,
 	MetricMemoryMajorPageFaults,
@@ -103,6 +105,8 @@ var MemoryMetrics = []Metric{
 	MetricMemoryPageFaultsRate,
 	MetricMemoryRequest,
 	MetricMemoryUsage,
+	MetricMemoryRSS,
+	MetricMemoryCache,
 	MetricMemoryWorkingSet,
 	MetricNodeMemoryAllocatable,
 	MetricNodeMemoryCapacity,
@@ -209,6 +213,44 @@ var MetricMemoryUsage = Metric{
 	},
 }
 
+var MetricMemoryCache = Metric{
+	MetricDescriptor: MetricDescriptor{
+		Name:        "memory/cache",
+		Description: "Cache memory",
+		Type:        MetricGauge,
+		ValueType:   ValueInt64,
+		Units:       UnitsBytes,
+	},
+	HasValue: func(spec *cadvisor.ContainerSpec) bool {
+		return spec.HasMemory
+	},
+	GetValue: func(spec *cadvisor.ContainerSpec, stat *cadvisor.ContainerStats) MetricValue {
+		return MetricValue{
+			ValueType:  ValueInt64,
+			MetricType: MetricGauge,
+			IntValue:   int64(stat.Memory.Cache)}
+	},
+}
+
+var MetricMemoryRSS = Metric{
+	MetricDescriptor: MetricDescriptor{
+		Name:        "memory/rss",
+		Description: "RSS memory",
+		Type:        MetricGauge,
+		ValueType:   ValueInt64,
+		Units:       UnitsBytes,
+	},
+	HasValue: func(spec *cadvisor.ContainerSpec) bool {
+		return spec.HasMemory
+	},
+	GetValue: func(spec *cadvisor.ContainerSpec, stat *cadvisor.ContainerStats) MetricValue {
+		return MetricValue{
+			ValueType:  ValueInt64,
+			MetricType: MetricGauge,
+			IntValue:   int64(stat.Memory.RSS)}
+	},
+}
+
 var MetricMemoryWorkingSet = Metric{
 	MetricDescriptor: MetricDescriptor{
 		Name:        "memory/working_set",