Commit graph

303 commits

Author SHA1 Message Date
Nick Owens eb79937340 switch to github.com/prometheus/common/log for logging 2015-10-30 13:20:06 -07:00
Julius Volz abe4f41937 Merge pull request #146 from AlphaB/ntp-protocol-version
Add NTP protocol version flag
2015-10-26 14:18:27 +01:00
Mikhail Salosin 10e65086ea Add NTP protocol version flag 2015-10-26 16:15:53 +03:00
Julius Volz 79b4c3fe1d Update Julius's email address in AUTHORS.md 2015-10-26 02:24:07 +01:00
Julius Volz 00e5d1334b Merge pull request #142 from crisidev/master
Add load5 and load15 to linux load metric
2015-10-21 23:26:02 +02:00
Matteo Bigoi e6ffeb4907 Reduce nesting in sanity check 2015-10-21 15:38:26 +00:00
Brian Brazil 4b28aa1953 Merge pull request #144 from lyda/util-update
Update with latest Makefile.COMMON from util.
2015-10-21 09:19:50 +01:00
Kevin Lyda 9f0f1edbd4 Update with latest Makefile.COMMON from util. 2015-10-21 09:14:59 +01:00
Fabian Reinartz 2516a5b3c2 Merge pull request #143 from lyda/filesystem-81
Make filesystem collector more robust.
2015-10-20 22:21:20 +02:00
Matteo Bigoi 8913d71ca4 Update end-to-end output for testing 2015-10-19 19:31:54 +00:00
Matteo Bigoi 5918be9a8c Fix documentation and a possible slice bounds out of range 2015-10-19 19:31:31 +00:00
Kevin Lyda 36291d456e Make filesystem collector more robust.
Current behaviour throws away all stats on any Statfs error. In practice
this is not useful. This turns such errors into debug log messages -
though silently ignoring them seems even more valid to me.
2015-10-18 19:47:45 +01:00
Matteo Bigoi 832ba9cc1d Add load5 and load15 to linux load metric 2015-10-17 13:07:39 +00:00
Tobias Schmidt eee6298266 Fix end-to-end test pipefail configuration 2015-10-17 06:31:51 -04:00
Tobias Schmidt 6cc5a6ec56 Fix Ken's name in authors file
Fixes #140.
2015-10-16 19:12:27 -04:00
Tobias Schmidt 44e5f5f53b Merge pull request #141 from prometheus/lint
Lint
2015-10-16 19:08:57 -04:00
Tobias Schmidt 0faa12cacd Update end-to-end fixtures 2015-10-16 18:53:44 -04:00
Tobias Schmidt e782412a03 Improve end-to-end test output 2015-10-16 18:53:44 -04:00
Tobias Schmidt 500340bdde Remove logging in IPVS tests 2015-10-16 18:53:44 -04:00
Tobias Schmidt 07e4ca8aa7 Run go vet during CI 2015-10-16 18:53:44 -04:00
Tobias Schmidt 7e2b65f942 Clean up lint errors 2015-10-16 18:53:44 -04:00
Tobias Schmidt 388cb5eafe Merge pull request #138 from prometheus/arm64-error
Fix compilation on linux/arm64
2015-10-15 11:34:31 -04:00
Brian Brazil 07022b3555 Fix compilation on linux/arm64 2015-10-15 08:44:49 +01:00
Brian Brazil 59f1949a76 Merge pull request #135 from prometheus/remove-unneeded-make
Remove unneeded `make` in empty slice initialization.
2015-10-11 21:44:46 +01:00
Brian Brazil e15e5f346c Merge pull request #134 from prometheus/lower-case-errors
Fix occurreneces of initial uppercase in error strings.
2015-10-11 21:44:11 +01:00
Julius Volz a25751e0b3 Fix occurreneces of initial uppercase in error strings. 2015-10-11 22:37:43 +02:00
Julius Volz 777a8ddd90 Remove unneeded make in empty slice initialization. 2015-10-11 22:37:34 +02:00
Tobias Schmidt e70cbd2045 Release 0.12.0rc1 2015-10-06 13:36:27 -04:00
Tobias Schmidt b97c0b98d7 Update email address in authors file 2015-10-06 12:54:49 -04:00
Julius Volz 90f2d321a8 Merge pull request #132 from icholy/master
Update AUTHORS
2015-10-06 18:51:57 +02:00
Ilia Choly adc94869e6 Update AUTHORS 2015-10-06 12:47:53 -04:00
Julius Volz 09743b18be Merge pull request #131 from icholy/master
Add supervisord collector to README
2015-10-06 18:41:43 +02:00
Ilia Choly e378568567 Add supervisord collector to README 2015-10-06 12:39:15 -04:00
Tobias Schmidt d7831b0d3a Merge pull request #129 from icholy/master
Add supervisord collector
2015-10-06 12:19:33 -04:00
Ilia Choly 9c0302571f Add supervisord collector 2015-10-06 11:50:54 -04:00
Tobias Schmidt 9810c57725 Merge pull request #128 from prometheus/ppc
Fix uname collector for ppc64 architectures
2015-10-03 22:05:25 -04:00
Tobias Schmidt 52f79e699d Fix uname collector for arm/ppc64/ppc64le architectures
The syscall.Utsname struct under arm/ppc64/ppc64le uses uint8 type
instead of int8.
2015-10-03 16:17:15 -04:00
Tobias Schmidt ee6b8e73a1 Merge pull request #127 from kirussel/kirussel/filesystem_freebsd
Fixed minor compile time error
2015-10-01 19:26:49 -04:00
Kirk Russell 88c30557c0 Fixed minor compile time error 2015-10-01 18:42:25 -04:00
Matthias Rampke be57deff08 Merge pull request #126 from alicebob/typo
fix copy-paste error in comment
2015-09-29 21:00:06 +02:00
Harmen 5d6fb852bb fix copy-paste error in comment
Comment seems to be copied from netdev_linux.go, where it is correct.
2015-09-29 20:52:33 +02:00
Julius Volz 1ff6c0ce9d Merge pull request #124 from matthiasr/end-to-end-test
Add an end to end test.
2015-09-28 17:52:34 +02:00
Matthias Rampke 7c47338081 Add an end-to-end test.
This test runs a selection of collectors against the fixtures and
compares the output to a reference.

The uname and filesystem collectors are disabled because they use system
calls that cannot be fixtured easily.
2015-09-28 13:56:22 +00:00
Matthias Rampke 788ac9a859 Rearrange fixtures to match "real" proc and sys.
And add some missing fixtures for default collectors, even if they're
not read by tests yet.
2015-09-28 13:56:22 +00:00
Matthias Rampke 85eb47197f Add a flag for the sysfs location.
Analogous to `collector.procfs`, but for `/sys`. Add tests for both.
2015-09-28 13:56:22 +00:00
Matthias Rampke 24c9db9600 Suppress log noise from textfile collector test. 2015-09-28 13:56:22 +00:00
Matthias Rampke 60dffaa9ff Fix mdadm collector.
In the move to the procfs flag, I accidentally changed the filename.
2015-09-28 13:56:22 +00:00
Matthias Rampke 34edb1bea5 Merge pull request #125 from kirussel/kirussel/freebsd_clocktime
converted freebsd cpu metrics to seconds
2015-09-28 13:04:15 +02:00
Kirk Russell 89875cefe8 converted freebsd cpu metrics to seconds 2015-09-26 20:58:47 -04:00
Matthias Rampke a942e719c8 Merge pull request #122 from matthiasr/travis-migrate
update travis
2015-09-26 18:31:21 +02:00