Commit graph

324 commits

Author SHA1 Message Date
Brian Brazil d3fd2a1944 Merge pull request #166 from pborzenkov/fix-osx-build
Fix compilation on OS X
2015-11-12 15:43:39 +00:00
Pavel Borzenkov d1789be33e Fix compilation on OS X
As OS X doesn't have it's own interrupts provider, don't build
interrupts_common on OS X as well. Otherwise build fails, because
interrupts_common depends on variables provided by platform-specific
files.

Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
2015-11-12 18:17:32 +03:00
Brian Brazil 7eb7917eea Merge pull request #164 from brunoqc/patch-1
Fix flag name in textfile.go
2015-11-10 20:55:16 +00:00
Bruno Bigras f74de8943b Fix flag name in textfile.go 2015-11-10 15:45:50 -05:00
Julius Volz f34e5374e0 Merge pull request #163 from prometheus/fix-ntp-version
Fix protocol version setting in NTP collector.
2015-11-10 11:25:17 +01:00
Julius Volz 07b39499cd Fix protocol version setting in NTP collector.
The upstream library changed their interface - the global Version
variable is gone:

283ed9d548
2015-11-10 10:08:57 +01:00
Tobias Schmidt b11cd9c7d4 Merge pull request #158 from mischief/interrupts-openbsd
collector: add openbsd support to interrupt collector
2015-11-06 22:26:09 -05:00
Tobias Schmidt fe40d8fce2 Merge pull request #159 from mischief/netdev-openbsd
collector: add openbsd support for netdev
2015-11-06 19:05:21 -05:00
Nick Owens 3eb2d6625a collector: add openbsd support for netdev 2015-11-06 15:29:57 -08:00
Nick Owens 73ee8f5257 collector: add openbsd support to interrupt collector 2015-11-06 14:49:04 -08:00
Fabian Reinartz e55e50bd57 Merge pull request #161 from AlphaB/master
Do not use flag before flag.Parse() was called
2015-11-06 17:54:28 +01:00
Mikhail Salosin e7359706d4 Do not use flag before flag.Parse() was called 2015-11-06 19:45:05 +03:00
Tobias Schmidt 89355b110b Merge pull request #160 from trumant/issues/100
Closes #100 by removing support for HTTP basic auth
2015-11-05 13:14:02 -05:00
Travis Truman 78cc741277 Closes #100 by removing support for HTTP basic auth 2015-11-05 09:20:01 -05:00
Tobias Schmidt 0a0babf3be Merge pull request #157 from mischief/filesystem-sync-labels
collector: sync bsd filesystem collector labels with linux
2015-11-02 23:20:10 -05:00
Nick Owens ebf3ef32f1 collector: sync bsd filesystem collector labels with linux 2015-11-02 19:16:17 -08:00
Tobias Schmidt 14078251c5 Merge pull request #156 from mischief/filesystem-bsd
collector: add openbsd suport to filesystem colector
2015-11-01 22:29:56 -05:00
Nick Owens b58d1fc971 collector: add openbsd suport to filesystem colector 2015-11-01 19:17:11 -08:00
Julius Volz 110fe938e6 Merge pull request #155 from mischief/loadavg
loadavg 1,5,15m for all unices
2015-10-31 19:13:28 +01:00
Nick Owens 2cb489253c collector: support 1,5,15m load averages for all unices 2015-10-31 06:04:24 -07:00
Julius Volz 6ebbda7f9e Merge pull request #152 from mischief/common-log
switch to github.com/prometheus/common/log for logging
2015-10-30 21:23:28 +01:00
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