Skip to content

Commit

Permalink
Merge pull request #264 from OpenTSDB/ISSUE-245
Browse files Browse the repository at this point in the history
Issue 245
  • Loading branch information
johann8384 committed Feb 8, 2016
2 parents d9f693d + 1aba197 commit 6abcc25
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 4 deletions.
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Change Log
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [1.3.1-SNAPSHOT]
### Collectors Added
- docker.py - Pulls metrics from a local Docker instance, tries /var/run/docker.sock, then localhost API

## [1.3.0-SNAPSHOT] - Next Upcoming Release
### Collectors Added
- rtt.py - Pings a configured set of hosts and records the result [#183](https://github.com/OpenTSDB/tcollector/pull/183)
- aws_cloudwatch.py - Collects metrics from AWS Cloudwatch [#246](https://github.com/OpenTSDB/tcollector/pull/246)
- tcp_bridge.py - Listens on a TCP port for metrics to relay to configured hosts [#252](https://github.com/OpenTSDB/tcollector/pull/252)

### Bugfixes
- zookeper.py [#221](https://github.com/OpenTSDB/tcollector/pull/221)
- mysql.py [#227](https://github.com/OpenTSDB/tcollector/pull/227)
- zfsiostats.py [#256](https://github.com/OpenTSDB/tcollector/pull/256)

### Core TCollector Features
- Support for HTTP API [#225](https://github.com/OpenTSDB/tcollector/issues/225)
- Support for MS precision [#230](https://github.com/OpenTSDB/tcollector/issues/230) [#234](https://github.com/OpenTSDB/tcollector/pull/234)
- Support TSD_HOSTS comma delimited host list rather than TSD_HOST/TSD_PORT [#237](https://github.com/OpenTSDB/tcollector/pull/237)
- RPM Packages now have base TCollector package, Collectors Package and an EOS specific package [#244](https://github.com/OpenTSDB/tcollector/pull/244)
- Improved FreeBSD compatiblity [#256](https://github.com/OpenTSDB/tcollector/pull/256) [#257](https://github.com/OpenTSDB/tcollector/pull/257) [#258](https://github.com/OpenTSDB/tcollector/pull/258) [#263](https://github.com/OpenTSDB/tcollector/pull/263)
- TCollector and all collectors now using '/usr/bin/env python' rather than '/usr/bin/python' [#263](https://github.com/OpenTSDB/tcollector/pull/263)

## [1.2.0] - 2015-05
### Initial Baseline
- This is the current release, so the CHANGELOG is from here forward.
13 changes: 13 additions & 0 deletions collectors/0/flume.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
#!/usr/bin/python
# This file is part of tcollector.
# Copyright (C) 2013 The tcollector Authors.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at your
# option) any later version. This program is distributed in the hope that it
# will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
# General Public License for more details. You should have received a copy
# of the GNU Lesser General Public License along with this program. If not,
# see <http://www.gnu.org/licenses/>.
#

"""
flume stats collector
Expand Down
4 changes: 2 additions & 2 deletions collectors/0/redis-stats.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
# Copyright (C) 2011 The tcollector Authors.
# This file is part of tcollector.
# Copyright (C) 2013 The tcollector Authors.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions collectors/0/riak.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
# Copyright (C) 2011 The tcollector Authors.
# This file is part of tcollector.
# Copyright (C) 2013 The tcollector Authors.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
Expand Down
13 changes: 13 additions & 0 deletions collectors/0/zookeeper.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
#!/usr/bin/python
# This file is part of tcollector.
# Copyright (C) 2013 The tcollector Authors.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at your
# option) any later version. This program is distributed in the hope that it
# will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
# General Public License for more details. You should have received a copy
# of the GNU Lesser General Public License along with this program. If not,
# see <http://www.gnu.org/licenses/>.
#

"""
Zookeeper collector
Expand Down

0 comments on commit 6abcc25

Please sign in to comment.