Merge pull request #354 from mkadokawa-idcf/feature/host-displayName-…

…and-memo Set `displayName`, `memo` via agent
mackerelio · Apr 9, 2024 · 96e2133 · 96e2133
2 parents c90bcb7 + 7de613a
commit 96e2133
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 0 deletions.
diff --git a/agent/run.go b/agent/run.go
@@ -67,6 +67,8 @@ func run(
 			return err
 		}
 		hostParam.RoleFullnames = conf.Roles
+		hostParam.DisplayName = conf.DisplayName
+		hostParam.Memo = conf.Memo
 		hostParam.Checks = checkManager.Configs()
 
 		duration = hostIDInitialRetryInterval

diff --git a/cmd/mackerel-container-agent/main.go b/cmd/mackerel-container-agent/main.go
@@ -51,6 +51,8 @@ func main() {
 		"MACKEREL_KUBERNETES_POD_NAME",
 		"MACKEREL_LOG_LEVEL",
 		"MACKEREL_ROLES",
+		"MACKEREL_DISPLAY_NAME",
+		"MACKEREL_MEMO",
 	}
 	for _, v := range env {
 		logger.Debugf("%s=%s", v, os.Getenv(v))

diff --git a/config/config.go b/config/config.go
@@ -31,6 +31,8 @@ type Config struct {
 	Apikey            string        `yaml:"apikey"`
 	Root              string        `yaml:"root"`
 	Roles             []string      `yaml:"roles"`
+	DisplayName       string        `yaml:"displayName"`
+	Memo              string        `yaml:"memo"`
 	IgnoreContainer   Regexpwrapper `yaml:"ignoreContainer"`
 	ReadinessProbe    *Probe        `yaml:"readinessProbe"`
 	HostStatusOnStart HostStatus    `yaml:"hostStatusOnStart"`
@@ -150,6 +152,14 @@ func load(ctx context.Context, location string) (*Config, error) {
 		conf.Roles = parseRoles(v)
 	}
 
+	if conf.DisplayName == "" {
+		conf.DisplayName = os.Getenv("MACKEREL_DISPLAY_NAME")
+	}
+
+	if conf.Memo == "" {
+		conf.Memo = os.Getenv("MACKEREL_MEMO")
+	}
+
 	if conf.IgnoreContainer.Regexp == nil {
 		if r := os.Getenv("MACKEREL_IGNORE_CONTAINER"); r != "" {
 			if err := conf.IgnoreContainer.UnmarshalText([]byte(r)); err != nil {

diff --git a/config/config_test.go b/config/config_test.go
@@ -183,6 +183,92 @@ roles:
 	}
 }
 
+func TestDisplayName(t *testing.T) {
+	conf := newConfigFile(t, `
+displayName: foo
+`)
+
+	t.Setenv("MACKEREL_DISPLAY_NAME", "bar")
+
+	testCases := []struct {
+		name     string
+		location string
+		expect   *Config
+	}{
+		{
+			name:     "config",
+			location: conf,
+			expect: &Config{
+				Root:        defaultRoot,
+				DisplayName: "foo",
+			},
+		},
+		{
+			name:     "env",
+			location: "",
+			expect: &Config{
+				Root:        defaultRoot,
+				DisplayName: "bar",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			conf, err := load(context.Background(), tc.location)
+			if err != nil {
+				t.Errorf("should not raise error: %v", err)
+			}
+			if !reflect.DeepEqual(conf, tc.expect) {
+				t.Errorf("expect %#v, got %#v", tc.expect, conf)
+			}
+		})
+	}
+}
+
+func TestMemo(t *testing.T) {
+	conf := newConfigFile(t, `
+memo: foo
+`)
+
+	t.Setenv("MACKEREL_MEMO", "bar")
+
+	testCases := []struct {
+		name     string
+		location string
+		expect   *Config
+	}{
+		{
+			name:     "config",
+			location: conf,
+			expect: &Config{
+				Root: defaultRoot,
+				Memo: "foo",
+			},
+		},
+		{
+			name:     "env",
+			location: "",
+			expect: &Config{
+				Root: defaultRoot,
+				Memo: "bar",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			conf, err := load(context.Background(), tc.location)
+			if err != nil {
+				t.Errorf("should not raise error: %v", err)
+			}
+			if !reflect.DeepEqual(conf, tc.expect) {
+				t.Errorf("expect %#v, got %#v", tc.expect, conf)
+			}
+		})
+	}
+}
+
 func TestIgnoreContainer(t *testing.T) {
 	conf := newConfigFile(t, `
 ignoreContainer: "^mackerel-.+$"