#35 - Added support for stripping host from metric

main.go

@@ -22,6 +22,7 @@ type HandlerConfig struct {
 	Precision          string
 	InsecureSkipVerify bool
 	CheckStatusMetric  bool
+	StripHost          bool
 }
 
 const (
@@ -32,6 +33,7 @@ const (
 	precision          = "precision"
 	insecureSkipVerify = "insecure-skip-verify"
 	checkStatusMetric  = "check-status-metric"
+	stripHost          = "strip-host"
 )
 
 var (
@@ -103,6 +105,14 @@ var (
 			Usage:     "if true, the check status result will be captured as a metric",
 			Value:     &config.CheckStatusMetric,
 		},
+		{
+			Path:      stripHost,
+			Argument:  stripHost,
+			Shorthand: "",
+			Default:   false,
+			Usage:     "if true, we strip the host from the metric",
+			Value:     &config.StripHost,
+		},
 	}
 )
 
@@ -159,6 +169,12 @@ func sendMetrics(event *corev2.Event) error {
 
 	for _, point := range event.Metrics.Points {
 		var tagKey string
+
+		if config.StripHost && strings.HasPrefix(point.Name, event.Entity.Name) {
+			// Adding a char since we also want to strip the dot
+			point.Name = point.Name[len(event.Entity.Name) + 1:]
+		}
+
 		nameField := strings.Split(point.Name, ".")
 		name := nameField[0]
 		if len(nameField) > 1 {

main_test.go

@@ -13,6 +13,14 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+var hostStrippingDataSet = []struct {
+	entityName string
+	expectedBody string
+}{
+	{"sensu.company.com", `answer,foo=bar,sensu_entity_name=sensu.company.com value=42`},
+	{"answer.company.com", `answer,foo=bar,sensu_entity_name=answer.company.com value=42`},
+}
+
 func TestStatusMetrics(t *testing.T) {
 	assert := assert.New(t)
 	event := corev2.FixtureEvent("entity1", "check1")
@@ -53,6 +61,29 @@ func TestSendMetrics(t *testing.T) {
 	assert.NoError(err)
 }
 
+func TestSendMetricsHostStripping(t *testing.T) {
+	for _, tt := range hostStrippingDataSet {
+		assert := assert.New(t)
+		event := corev2.FixtureEvent(tt.entityName, "check1")
+		event.Check = nil
+		event.Metrics = corev2.FixtureMetrics()
+		event.Metrics.Points[0].Name = tt.entityName + ".answer"
+
+		var apiStub = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			body, _ := ioutil.ReadAll(r.Body)
+			assert.Contains(string(body), tt.expectedBody)
+			w.WriteHeader(http.StatusOK)
+			_, err := w.Write([]byte(`{"ok": true}`))
+			require.NoError(t, err)
+		}))
+
+		config.Addr = apiStub.URL
+		config.StripHost = true
+		err := sendMetrics(event)
+		assert.NoError(err)
+	}
+}
+
 func TestSendAnnotation(t *testing.T) {
 	assert := assert.New(t)
 	event := corev2.FixtureEvent("entity1", "check1")