From c3e640830a2da3174221d06bd416d82980184f44 Mon Sep 17 00:00:00 2001
From: KevinBetterQ <1093850932@qq.com>
Date: Tue, 4 Jun 2019 10:16:49 +0800
Subject: [PATCH] feature: add kernel info to EngineVersion metric

Signed-off-by: KevinBetterQ <1093850932@qq.com>
---
 apis/metrics/metrics.go         |  2 +-
 main.go                         | 11 ++++++-
 test/api_system_metrics_test.go | 51 +++++++++++++++++++++++++++++++++
 test/util_api.go                | 15 ++++++++++
 4 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 test/api_system_metrics_test.go

diff --git a/apis/metrics/metrics.go b/apis/metrics/metrics.go
index b8d73415b..a22a2898c 100644
--- a/apis/metrics/metrics.go
+++ b/apis/metrics/metrics.go
@@ -38,7 +38,7 @@ var (
 	ImageActionsTimer = metrics.NewLabelTimer(subsystemPouch, "image_actions", "The number of seconds it takes to process each image action", "action")
 
 	// EngineVersion records the version and commit information of the engine process.
-	EngineVersion = metrics.NewLabelGauge(subsystemPouch, "engine", "The version and commit information of the engine process", "commit")
+	EngineVersion = metrics.NewLabelGauge(subsystemPouch, "engine", "The version and commit information of the engine process", "commit", "version", "kernel")
 )
 
 var registerMetrics sync.Once
diff --git a/main.go b/main.go
index 5be38bfa0..850f67ee8 100644
--- a/main.go
+++ b/main.go
@@ -17,6 +17,7 @@ import (
 	"github.com/alibaba/pouch/daemon/config"
 	"github.com/alibaba/pouch/lxcfs"
 	"github.com/alibaba/pouch/pkg/debug"
+	"github.com/alibaba/pouch/pkg/kernel"
 	"github.com/alibaba/pouch/pkg/utils"
 	"github.com/alibaba/pouch/storage/quota"
 	"github.com/alibaba/pouch/version"
@@ -167,7 +168,15 @@ func runDaemon(cmd *cobra.Command) error {
 		fmt.Printf("pouchd version: %s, build: %s, build at: %s\n", version.Version, version.GitCommit, version.BuildTime)
 		return nil
 	}
-	metrics.EngineVersion.WithLabelValues(version.GitCommit).Set(1)
+
+	kernelVersion, err := kernel.GetKernelVersion()
+	if err != nil {
+		return fmt.Errorf("failed to get kernel version: %s", err)
+	}
+	metrics.EngineVersion.WithLabelValues(
+		version.GitCommit,
+		version.Version,
+		kernelVersion.String()).Set(1)
 	// initialize log.
 	initLog()
 
diff --git a/test/api_system_metrics_test.go b/test/api_system_metrics_test.go
new file mode 100644
index 000000000..79847c472
--- /dev/null
+++ b/test/api_system_metrics_test.go
@@ -0,0 +1,51 @@
+package main
+
+import (
+	"regexp"
+
+	"github.com/alibaba/pouch/pkg/kernel"
+	"github.com/alibaba/pouch/test/environment"
+	"github.com/alibaba/pouch/version"
+
+	"github.com/go-check/check"
+)
+
+// APIEngineVersionMetricsSuite is the test suite for EngineVersion metrics API.
+type APIEngineVersionMetricsSuite struct{}
+
+func init() {
+	check.Suite(&APIEngineVersionMetricsSuite{})
+}
+
+// SetUpSuite does common setup in the beginning of each suite.
+func (suite *APIEngineVersionMetricsSuite) SetUpSuite(c *check.C) {
+	SkipIfFalse(c, environment.IsLinux)
+}
+
+// TestEngineVersionMetrics tests metrics of EngineVersion.
+func (suite *APIEngineVersionMetricsSuite) TestEngineVersionMetrics(c *check.C) {
+	commitExpected := version.GitCommit
+	versionExpected := version.Version
+	kernelVersion, err := kernel.GetKernelVersion()
+	c.Assert(err, check.IsNil)
+	kernelExpected := kernelVersion.String()
+
+	key := "engine_daemon_engine_info{"
+	versionMetrics := GetMetricLine(c, key)
+
+	regularCommit := `^.*commit="(.*?)".*$`
+	regular := regexp.MustCompile(regularCommit)
+	params := regular.FindStringSubmatch(versionMetrics)
+	c.Assert(params[1], check.Equals, commitExpected)
+
+	regularVersion := `^.*version="(.*?)".*$`
+	regular = regexp.MustCompile(regularVersion)
+	params = regular.FindStringSubmatch(versionMetrics)
+	c.Assert(params[1], check.Equals, versionExpected)
+
+	regularKernel := `^.*kernel="(.*?)".*$`
+	regular = regexp.MustCompile(regularKernel)
+	params = regular.FindStringSubmatch(versionMetrics)
+	c.Assert(params[1], check.Equals, kernelExpected)
+
+}
diff --git a/test/util_api.go b/test/util_api.go
index 9c6a4094b..139dbfbfe 100644
--- a/test/util_api.go
+++ b/test/util_api.go
@@ -345,3 +345,18 @@ func GetMetric(c *check.C, key string, keySuccess string) (int, int) {
 
 	return iCount, iCountSuccess
 }
+
+// GetMetricLine get metrics from prometheus server, return the single metric.
+func GetMetricLine(c *check.C, key string) string {
+	resp, err := request.Get("/metrics")
+	c.Assert(err, check.IsNil)
+	defer resp.Body.Close()
+	scanner := bufio.NewScanner(resp.Body)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.Contains(line, key) {
+			return line
+		}
+	}
+	return ""
+}