Merge pull request #1542 from andyxning/add_filesystemd_inodes

add filesystem inode metrics

Author: DirectXMan12

docs/storage-schema.md

@@ -15,6 +15,8 @@ Heapster exports the following metrics to its backends.
 | filesystem/usage | Total number of bytes consumed on a filesystem. |
 | filesystem/limit | The total size of filesystem in bytes. |
 | filesystem/available | The number of available bytes remaining in a the filesystem |
+| filesystem/inodes | The number of available inodes in a the filesystem |
+| filesystem/inodes_free | The number of free inodes remaining in a the filesystem |
 | memory/limit | Memory hard limit in bytes. |
 | memory/major_page_faults | Number of major page faults. |
 | memory/major_page_faults_rate | Number of major page faults per second. |

integration/heapster_api_test.go

@@ -354,7 +354,9 @@ func runMetricExportTest(fm kubeFramework, svc *kube_v1.Service) error {
 		explicitRequirement := map[string][]string{
 			core.MetricFilesystemUsage.MetricDescriptor.Name: {core.LabelResourceID.Key},
 			core.MetricFilesystemLimit.MetricDescriptor.Name: {core.LabelResourceID.Key},
-			core.MetricFilesystemAvailable.Name:              {core.LabelResourceID.Key}}
+			core.MetricFilesystemAvailable.Name:              {core.LabelResourceID.Key},
+			core.MetricFilesystemInodes.Name:                 {core.LabelResourceID.Key},
+			core.MetricFilesystemInodesFree.Name:             {core.LabelResourceID.Key}}
 
 		for metricName, points := range ts.Metrics {
 			md, exists := mdMap[metricName]

metrics/core/metrics.go

@@ -69,6 +69,8 @@ var LabeledMetrics = []Metric{
 	MetricFilesystemUsage,
 	MetricFilesystemLimit,
 	MetricFilesystemAvailable,
+	MetricFilesystemInodes,
+	MetricFilesystemInodesFree,
 }
 
 var NodeAutoscalingMetrics = []Metric{
@@ -96,6 +98,8 @@ var FilesystemMetrics = []Metric{
 	MetricFilesystemAvailable,
 	MetricFilesystemLimit,
 	MetricFilesystemUsage,
+	MetricFilesystemInodes,
+	MetricFilesystemInodesFree,
 }
 var MemoryMetrics = []Metric{
 	MetricMemoryLimit,
@@ -651,6 +655,72 @@ var MetricFilesystemAvailable = Metric{
 	},
 }
 
+var MetricFilesystemInodes = Metric{
+	MetricDescriptor: MetricDescriptor{
+		Name:        "filesystem/inodes",
+		Description: "Total number of inodes on a filesystem",
+		Type:        MetricGauge,
+		ValueType:   ValueInt64,
+		Units:       UnitsBytes,
+		Labels:      metricLabels,
+	},
+	HasLabeledMetric: func(spec *cadvisor.ContainerSpec) bool {
+		return spec.HasFilesystem
+	},
+	GetLabeledMetric: func(spec *cadvisor.ContainerSpec, stat *cadvisor.ContainerStats) []LabeledMetric {
+		result := []LabeledMetric{}
+		for _, fs := range stat.Filesystem {
+			if fs.HasInodes {
+				result = append(result, LabeledMetric{
+					Name: "filesystem/inodes",
+					Labels: map[string]string{
+						LabelResourceID.Key: fs.Device,
+					},
+					MetricValue: MetricValue{
+						ValueType:  ValueInt64,
+						MetricType: MetricGauge,
+						IntValue:   int64(fs.Inodes),
+					},
+				})
+			}
+		}
+		return result
+	},
+}
+
+var MetricFilesystemInodesFree = Metric{
+	MetricDescriptor: MetricDescriptor{
+		Name:        "filesystem/inodes_free",
+		Description: "Free number of inodes on a filesystem",
+		Type:        MetricGauge,
+		ValueType:   ValueInt64,
+		Units:       UnitsBytes,
+		Labels:      metricLabels,
+	},
+	HasLabeledMetric: func(spec *cadvisor.ContainerSpec) bool {
+		return spec.HasFilesystem
+	},
+	GetLabeledMetric: func(spec *cadvisor.ContainerSpec, stat *cadvisor.ContainerStats) []LabeledMetric {
+		result := []LabeledMetric{}
+		for _, fs := range stat.Filesystem {
+			if fs.HasInodes {
+				result = append(result, LabeledMetric{
+					Name: "filesystem/inodes_free",
+					Labels: map[string]string{
+						LabelResourceID.Key: fs.Device,
+					},
+					MetricValue: MetricValue{
+						ValueType:  ValueInt64,
+						MetricType: MetricGauge,
+						IntValue:   int64(fs.InodesFree),
+					},
+				})
+			}
+		}
+		return result
+	},
+}
+
 func IsNodeAutoscalingMetric(name string) bool {
 	for _, autoscalingMetric := range NodeAutoscalingMetrics {
 		if autoscalingMetric.MetricDescriptor.Name == name {