Skip to content
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

[Docker Plugin] add server hostname for each docker measurements #1599

Merged
merged 5 commits into from
Sep 6, 2016
Merged

[Docker Plugin] add server hostname for each docker measurements #1599

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d5fb6e
add server hostname for each docker measurements
aaronjheng Aug 8, 2016
fa7b6d8
update CHANGELOG
aaronjheng Aug 8, 2016
16ba988
Merge remote-tracking branch 'origin/master' into docker-server-tag
aaronjheng Sep 4, 2016
d073e33
move feature to v1.1
aaronjheng Sep 4, 2016
e2e075b
tweak docker_engine_host tag
aaronjheng Sep 6, 2016
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into docker-server-tag
  • Loading branch information
@aaronjheng
aaronjheng committed Sep 4, 2016
commit 16ba988ee80208b37ac99eb48124c271e25afe46
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ consistent with the behavior of `collection_jitter`.
- [#1296](https://github.com/influxdata/telegraf/issues/1296): Refactor of flush_jitter argument.
- [#1213](https://github.com/influxdata/telegraf/issues/1213): Add inactive & active memory to mem plugin.
- [#1599](https://github.com/influxdata/telegraf/pull/1599): Add server hostname for each docker measurements.
- [#1543](https://github.com/influxdata/telegraf/pull/1543): Official Windows service.
- [#1414](https://github.com/influxdata/telegraf/pull/1414): Forking sensors command to remove C package dependency.
- [#1389](https://github.com/influxdata/telegraf/pull/1389): Add a new SNMP plugin.

### Bugfixes

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.