Merge pull request #1816 from jippi/add-datadog-telemetry

Add datadog telemetry

command/agent/command.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/armon/go-metrics"
 	"github.com/armon/go-metrics/circonus"
+	"github.com/armon/go-metrics/datadog"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/go-checkpoint"
 	"github.com/hashicorp/go-syslog"
@@ -617,6 +618,15 @@ func (c *Command) setupTelemetry(config *Config) error {
 		fanout = append(fanout, sink)
 	}
 
+	// Configure the datadog sink
+	if telConfig.DataDogAddr != "" {
+		sink, err := datadog.NewDogStatsdSink(telConfig.DataDogAddr, config.NodeName)
+		if err != nil {
+			return err
+		}
+		fanout = append(fanout, sink)
+	}
+
 	// Configure the Circonus sink
 	if telConfig.CirconusAPIToken != "" || telConfig.CirconusCheckSubmissionURL != "" {
 		cfg := &circonus.Config{}

command/agent/config.go

@@ -259,6 +259,7 @@ func (s *ServerConfig) EncryptBytes() ([]byte, error) {
 type Telemetry struct {
 	StatsiteAddr             string        `mapstructure:"statsite_address"`
 	StatsdAddr               string        `mapstructure:"statsd_address"`
+	DataDogAddr              string        `mapstructure:"datadog_address"`
 	DisableHostname          bool          `mapstructure:"disable_hostname"`
 	CollectionInterval       string        `mapstructure:"collection_interval"`
 	collectionInterval       time.Duration `mapstructure:"-"`
@@ -773,6 +774,9 @@ func (a *Telemetry) Merge(b *Telemetry) *Telemetry {
 	if b.StatsdAddr != "" {
 		result.StatsdAddr = b.StatsdAddr
 	}
+	if b.DataDogAddr != "" {
+		result.DataDogAddr = b.DataDogAddr
+	}
 	if b.DisableHostname {
 		result.DisableHostname = true
 	}

command/agent/config_test.go

@@ -36,6 +36,7 @@ func TestConfig_Merge(t *testing.T) {
 		Telemetry: &Telemetry{
 			StatsiteAddr:                       "127.0.0.1:8125",
 			StatsdAddr:                         "127.0.0.1:8125",
+			DataDogAddr:                        "127.0.0.1:8125",
 			DisableHostname:                    false,
 			CirconusAPIToken:                   "0",
 			CirconusAPIApp:                     "nomadic",
@@ -148,6 +149,7 @@ func TestConfig_Merge(t *testing.T) {
 		Telemetry: &Telemetry{
 			StatsiteAddr:                       "127.0.0.2:8125",
 			StatsdAddr:                         "127.0.0.2:8125",
+			DataDogAddr:                        "127.0.0.1:8125",
 			DisableHostname:                    true,
 			PublishNodeMetrics:                 true,
 			PublishAllocationMetrics:           true,