Skip to content

Add http path configuration for OpenTSDB plugin #4347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielnelson merged 2 commits into from
Jul 2, 2018
+15 −1
Merged

Add http path configuration for OpenTSDB plugin #4347

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dff2ab
Add http path configuration for OpenTSDB plugin
jtlisi Jun 26, 2018
f7fd035
set default path to /api/put
jtlisi Jun 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions etc/telegraf.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,10 @@
# ## Not used with telnet API.
# httpBatchSize = 50
#
# ## URI Path for Http requests to OpenTSDB.
# ## Used in cases where OpenTSDB is located behind a reverse proxy.
# httpPath = "/api/put"
#
# ## Debug true - Prints OpenTSDB communication
# debug = false
#
Expand Down
6 changes: 6 additions & 0 deletions plugins/outputs/opentsdb/opentsdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ type OpenTSDB struct {
Port int

HttpBatchSize int
HttpPath string

Debug bool

Expand All @@ -54,6 +55,10 @@ var sampleConfig = `
## Not used with telnet API.
httpBatchSize = 50

## URI Path for Http requests to OpenTSDB.
## Used in cases where OpenTSDB is located behind a reverse proxy.
httpPath = "/api/put"

## Debug true - Prints OpenTSDB communication
debug = false

Expand Down Expand Up @@ -121,6 +126,7 @@ func (o *OpenTSDB) WriteHttp(metrics []telegraf.Metric, u *url.URL) error {
Scheme: u.Scheme,
User: u.User,
BatchSize: o.HttpBatchSize,
Path: o.HttpPath,
Debug: o.Debug,
}

Expand Down
3 changes: 2 additions & 1 deletion plugins/outputs/opentsdb/opentsdb_http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ type openTSDBHttp struct {
Scheme string
User *url.Userinfo
BatchSize int
Path string
Debug bool

metricCounter int
Expand Down Expand Up @@ -123,7 +124,7 @@ func (o *openTSDBHttp) flush() error {
Scheme: o.Scheme,
User: o.User,
Host: fmt.Sprintf("%s:%d", o.Host, o.Port),
Path: "/api/put",
Path: o.Path,
Copy link
Copy Markdown
Contributor

@glinton glinton Jun 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you default o.Path to "/api/put" in order to not break any current implementations.

Copy link
Copy Markdown
Contributor Author

@jtlisi jtlisi Jul 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 This should be all set now

}

if o.Debug {
Expand Down
1 change: 1 addition & 0 deletions plugins/outputs/opentsdb/opentsdb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ func BenchmarkHttpSend(b *testing.B) {
Port: port,
Prefix: "",
HttpBatchSize: BatchSize,
HttpPath: "/api/put",
}

b.ResetTimer()
Expand Down