Skip to content

Commit 6abcc25

Browse files
committed
Merge pull request #264 from OpenTSDB/ISSUE-245
Issue 245
2 parents d9f693d + 1aba197 commit 6abcc25

File tree

5 files changed

+60
-4
lines changed

5 files changed

+60
-4
lines changed

CHANGELOG.md

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Change Log
2+
All notable changes to this project will be documented in this file.
3+
This project adheres to [Semantic Versioning](http://semver.org/).
4+
5+
## [1.3.1-SNAPSHOT]
6+
### Collectors Added
7+
- docker.py - Pulls metrics from a local Docker instance, tries /var/run/docker.sock, then localhost API
8+
9+
## [1.3.0-SNAPSHOT] - Next Upcoming Release
10+
### Collectors Added
11+
- rtt.py - Pings a configured set of hosts and records the result [#183](https://github.com/OpenTSDB/tcollector/pull/183)
12+
- aws_cloudwatch.py - Collects metrics from AWS Cloudwatch [#246](https://github.com/OpenTSDB/tcollector/pull/246)
13+
- tcp_bridge.py - Listens on a TCP port for metrics to relay to configured hosts [#252](https://github.com/OpenTSDB/tcollector/pull/252)
14+
15+
### Bugfixes
16+
- zookeper.py [#221](https://github.com/OpenTSDB/tcollector/pull/221)
17+
- mysql.py [#227](https://github.com/OpenTSDB/tcollector/pull/227)
18+
- zfsiostats.py [#256](https://github.com/OpenTSDB/tcollector/pull/256)
19+
20+
### Core TCollector Features
21+
- Support for HTTP API [#225](https://github.com/OpenTSDB/tcollector/issues/225)
22+
- Support for MS precision [#230](https://github.com/OpenTSDB/tcollector/issues/230) [#234](https://github.com/OpenTSDB/tcollector/pull/234)
23+
- Support TSD_HOSTS comma delimited host list rather than TSD_HOST/TSD_PORT [#237](https://github.com/OpenTSDB/tcollector/pull/237)
24+
- RPM Packages now have base TCollector package, Collectors Package and an EOS specific package [#244](https://github.com/OpenTSDB/tcollector/pull/244)
25+
- 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)
26+
- TCollector and all collectors now using '/usr/bin/env python' rather than '/usr/bin/python' [#263](https://github.com/OpenTSDB/tcollector/pull/263)
27+
28+
## [1.2.0] - 2015-05
29+
### Initial Baseline
30+
- This is the current release, so the CHANGELOG is from here forward.

collectors/0/flume.py

+13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11
#!/usr/bin/python
2+
# This file is part of tcollector.
3+
# Copyright (C) 2013 The tcollector Authors.
4+
#
5+
# This program is free software: you can redistribute it and/or modify it
6+
# under the terms of the GNU Lesser General Public License as published by
7+
# the Free Software Foundation, either version 3 of the License, or (at your
8+
# option) any later version. This program is distributed in the hope that it
9+
# will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
10+
# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
11+
# General Public License for more details. You should have received a copy
12+
# of the GNU Lesser General Public License along with this program. If not,
13+
# see <http://www.gnu.org/licenses/>.
14+
#
215

316
"""
417
flume stats collector

collectors/0/redis-stats.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/python
2-
#
3-
# Copyright (C) 2011 The tcollector Authors.
2+
# This file is part of tcollector.
3+
# Copyright (C) 2013 The tcollector Authors.
44
#
55
# This program is free software: you can redistribute it and/or modify it
66
# under the terms of the GNU Lesser General Public License as published by

collectors/0/riak.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/python
2-
#
3-
# Copyright (C) 2011 The tcollector Authors.
2+
# This file is part of tcollector.
3+
# Copyright (C) 2013 The tcollector Authors.
44
#
55
# This program is free software: you can redistribute it and/or modify it
66
# under the terms of the GNU Lesser General Public License as published by

collectors/0/zookeeper.py

+13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11
#!/usr/bin/python
2+
# This file is part of tcollector.
3+
# Copyright (C) 2013 The tcollector Authors.
4+
#
5+
# This program is free software: you can redistribute it and/or modify it
6+
# under the terms of the GNU Lesser General Public License as published by
7+
# the Free Software Foundation, either version 3 of the License, or (at your
8+
# option) any later version. This program is distributed in the hope that it
9+
# will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
10+
# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
11+
# General Public License for more details. You should have received a copy
12+
# of the GNU Lesser General Public License along with this program. If not,
13+
# see <http://www.gnu.org/licenses/>.
14+
#
215

316
"""
417
Zookeeper collector

0 commit comments

Comments
 (0)