Merge pull request #3 from vinted/feature/enable_ceph_mgr_socket_metrics

Enable ceph-mgr socket metrics
vinted · Feb 13, 2020 · 98fa017 · 98fa017
2 parents 07037ab + 83a9319
commit 98fa017
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/collector.go b/collector.go
@@ -77,6 +77,12 @@ func GetDeviceType(socketName string) map[string]string {
 		device["type"] = "ceph_radosgw"
 		device["name"] = strings.ReplaceAll(re.FindString(socketName), ".", "")
 	}
+	if strings.Contains(socketName, "mgr.") {
+		log.Debug("Device is a mgr")
+		var re = regexp.MustCompile(`mgr(.[0-9]*)`)
+		device["type"] = "ceph_mgr"
+		device["name"] = strings.ReplaceAll(re.FindString(socketName), ".", "")
+	}
 	log.Debug("Device:", device)
 	return device
 }

diff --git a/collector_test.go b/collector_test.go
@@ -45,6 +45,10 @@ func TestGetDeviceType(t *testing.T) {
 	if value["type"] != "ceph_radosgw" || value["name"] != "radosgw" {
 		t.Errorf("GetDeviceType failed. Got: type: %s, name: %s", value["type"], value["name"])
 	}
+	value = GetDeviceType("/var/run/ceph/ceph-cluster-client.radosgw.test-ceph-mgr.asok")
+	if value["type"] != "ceph_mgr" || value["name"] != "mgr" {
+		t.Errorf("GetDeviceType failed. Got: type: %s, name: %s", value["type"], value["name"])
+	}
 }
 
 func TestLoadJson(t *testing.T) {