Skip to content

Commit

Permalink
Add riemann output
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeffrey Allen committed Oct 22, 2015
1 parent ae7ad22 commit b212d47
Show file tree
Hide file tree
Showing 4 changed files with 125 additions and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ found by running `telegraf -sample-config`.
* opentsdb
* amqp (rabbitmq)
* mqtt
* riemann

## Contributing

Expand Down
1 change: 1 addition & 0 deletions outputs/all/all.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ import (
_ "github.com/influxdb/telegraf/outputs/kafka"
_ "github.com/influxdb/telegraf/outputs/mqtt"
_ "github.com/influxdb/telegraf/outputs/opentsdb"
_ "github.com/influxdb/telegraf/outputs/riemann"
)
96 changes: 96 additions & 0 deletions outputs/riemann/riemann.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
package riemann

import (
"errors"
"fmt"
"os"

"github.com/influxdb/influxdb/client/v2"
"github.com/influxdb/telegraf/outputs"
"github.com/allenj/raidman"
)

type Riemann struct {
URL string
Transport string

client raidman.Client
}

var sampleConfig = `
# URL of server
url = "localhost:5555"
# transport protocol to use either tcp or udp
transport = "tcp"
`

func (r *Riemann) Connect() error {
c, err := raidman.Dial(r.Transport, r.URL)

if err != nil {
return err
}

r.client = *c
return nil
}

func (r *Riemann) Close() error {
r.client.Close()
return nil
}

func (r *Riemann) SampleConfig() string {
return sampleConfig
}

func (r *Riemann) Description() string {
return "Configuration for the Riemann server to send metrics to"
}

func (r *Riemann) Write(points []*client.Point) error {
if len(points) == 0 {
return nil
}

var events []*raidman.Event
for _, p := range points {
ev := buildEvent(p)
events = append(events, &ev)
}

var senderr = r.client.SendMulti(events)
if senderr != nil {
return errors.New(fmt.Sprintf("FAILED to send riemann message: %s\n",
senderr))
}

return nil
}

func buildEvent(p *client.Point) (raidman.Event) {
host := p.Tags()["host"]

if len(host) == 0 {
hostname, err := os.Hostname()
if err != nil {
host = "unknown"
} else {
host = hostname
}
}

var event = &raidman.Event{
Host: host,
Service: p.Name(),

This comment has been minimized.

Copy link
@rzagabe

rzagabe Oct 25, 2015

This feels quite uncomfortable to assign the service name to the metric name. IMO telegraf would be a better fit.
Edit: What about setting the field Host to {hostname}-telegraf instead.

Metric: p.Fields()["value"],

This comment has been minimized.

Copy link
@rzagabe

rzagabe Oct 25, 2015

It would be interesting to include the tags from the client.Point structure in the raidman.Event structure.

}

return *event
}

func init() {
outputs.Add("riemann", func() outputs.Output {
return &Riemann{}
})
}
27 changes: 27 additions & 0 deletions outputs/riemann/riemann_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package riemann

import (
"testing"

"github.com/influxdb/telegraf/testutil"
"github.com/stretchr/testify/require"
)

func TestConnectAndWrite(t *testing.T) {
if testing.Short() {
t.Skip("Skipping integration test in short mode")
}

url := testutil.GetLocalHost() + ":5555"

r := &Riemann{
URL: url,
Transport: "tcp",
}

err := r.Connect()
require.NoError(t, err)

err = r.Write(testutil.MockBatchPoints().Points())
require.NoError(t, err)
}

0 comments on commit b212d47

Please sign in to comment.