Add consul segment fingerprint (hashicorp#7214)

fredrikhgrelland · Oct 22, 2020 · ed35f50 · ed35f50
1 parent e71de8d
commit ed35f50
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/client/fingerprint/consul.go b/client/fingerprint/consul.go
@@ -81,7 +81,13 @@ func (f *ConsulFingerprint) Fingerprint(req *FingerprintRequest, resp *Fingerpri
 	} else {
 		f.logger.Warn("unable to fingerprint consul.datacenter")
 	}
-
+	if g, ok := info["Member"]["Tags"].(map[string]interface{}); ok {
+		if s, ok := g["segment"].(string); ok {
+			resp.AddAttribute("consul.segment", s)
+		}
+	} else {
+		f.logger.Warn("unable to fingerprint consul.segment")
+	}
 	if dc, ok := resp.Attributes["consul.datacenter"]; ok {
 		if name, ok2 := resp.Attributes["unique.consul.name"]; ok2 {
 			resp.AddLink("consul", fmt.Sprintf("%s.%s", dc, name))
@@ -108,6 +114,7 @@ func (f *ConsulFingerprint) clearConsulAttributes(r *FingerprintResponse) {
 	r.RemoveAttribute("consul.revision")
 	r.RemoveAttribute("unique.consul.name")
 	r.RemoveAttribute("consul.datacenter")
+	r.RemoveAttribute("consul.segment")
 	r.RemoveLink("consul")
 }
 

diff --git a/client/fingerprint/consul_test.go b/client/fingerprint/consul_test.go
@@ -44,6 +44,7 @@ func TestConsulFingerprint(t *testing.T) {
 	assertNodeAttributeContains(t, response.Attributes, "consul.revision")
 	assertNodeAttributeContains(t, response.Attributes, "unique.consul.name")
 	assertNodeAttributeContains(t, response.Attributes, "consul.datacenter")
+	assertNodeAttributeContains(t, response.Attributes, "consul.segment")
 
 	if _, ok := response.Links["consul"]; !ok {
 		t.Errorf("Expected a link to consul, none found")
@@ -152,6 +153,7 @@ const mockConsulResponse = `
       "expect": "3",
       "port": "8300",
       "role": "consul",
+      "segment": "mysegment",
       "vsn": "2"
     },
     "Status": 1,
@@ -199,6 +201,7 @@ func TestConsulFingerprint_UnexpectedResponse(t *testing.T) {
 		"consul.revision",
 		"unique.consul.name",
 		"consul.datacenter",
+		"consul.segment",
 	}
 
 	for _, attr := range attrs {