Commit Graph

362 Commits

Author SHA1 Message Date
Björn Rabenstein
d955d99e7b Merge pull request #194 from pborzenkov/fix-build-wo-conntrack
Fix build w/o conntrack collector
2016-01-15 14:01:32 +01:00
Pavel Borzenkov
21d473ffd4 Fix compilation without conntrack collector
Entry collector uses readUintFromFile() function which is defined by
conntrack collector. Thus, it is impossible to build node_exporter w/o
conntrack collector. Fix this by factoring out the function into
helper.go file.

Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
2016-01-15 15:16:12 +03:00
Björn Rabenstein
fae388dcab Merge pull request #191 from erkki/fix_filefd
fix block nesting bug
2016-01-14 15:15:08 +01:00
Matthias Rampke
af75a4f3c7 Merge pull request #193 from prometheus/superq/e2e_conflicts
Re-arrange collectors list in end-to-end test
2016-01-14 09:59:19 +00:00
Ben Kochie
45c0d38ce0 Re-arrange collectors list in end-to-end test
Reduce merge conflicts by breaking up the list into a multi-line string.
2016-01-14 10:51:11 +01:00
Brian Brazil
92488e8693 Merge pull request #192 from RichiH/fix/entropy_naming
collector/entropy_linux.go: Use canonical name for available entropy
2016-01-14 08:56:58 +00:00
Richard Hartmann
e8fdc4d160 collector/entropy_linux.go: Use canonical name for available entropy 2016-01-14 08:26:04 +01:00
Brian Brazil
dc4314b037 Merge pull request #190 from RichiH/feature/entropy_collector
Introduce entropy collector for Linux
2016-01-13 17:43:43 +00:00
Richard Hartmann
aee580d8d8 Introduce entropy collector for Linux 2016-01-13 18:29:52 +01:00
Erkki Eilonen
ff7106615e fix block nesting bug causing filefd values to never be updated post initial call 2016-01-13 21:09:01 +07:00
Brian Brazil
6b506f0736 Merge pull request #188 from RichiH/fix/README
README.md: Document actual default collectors
2016-01-13 09:40:59 +00:00
Richard Hartmann
a957f989fd README.md: Fix typo 2016-01-13 10:23:11 +01:00
Richard Hartmann
3640c54ce6 README.md: Document actual default collectors 2016-01-13 10:22:36 +01:00
Brian Brazil
e6a6ee5d85 Merge pull request #186 from f0/master
Add vmstat collector
2016-01-11 08:47:56 +00:00
Florian Koch
5d5346af8a Add vmstat collector, enabled per default 2016-01-11 07:58:30 +01:00
Tobias Schmidt
e7a4ea3fe8 Merge pull request #184 from caskey/master
Build cleanly under windows.
2016-01-07 21:48:03 -05:00
Caskey L. Dickson
ab9ee574fb Build cleanly under windows.
Removes unused signal handlers left over from signal based collection
and block the non windows-relevant collectors loadavg and interrupts.

Signal based collection removed in 1c17481a42.
2016-01-07 17:59:16 -08:00
Tobias Schmidt
96ecc3d715 Merge pull request #183 from juergenhoetzel/master
Fix compilation on FreeBSD. Refs #139
2016-01-07 14:12:18 -05:00
Juergen Hoetzel
e02d99ebff Fix compilation on FreeBSD. Refs #139
There is no interrupts_freebsd.go implementation yet.
2016-01-07 19:25:30 +01:00
Tobias Schmidt
3171f404f4 Merge pull request #176 from SQiShER/version-endpoint
Expose version and other build information as metric similar to Prometheus itself
2016-01-06 18:00:00 -05:00
Tobias Schmidt
18cb552947 Verify go formatting 2016-01-06 17:56:48 -05:00
Daniel Bechler
fc3931c924 Add build_info metric similar to the one of Prometheus itself 2016-01-06 23:54:33 +01:00
Brian Brazil
a59c71b505 Merge pull request #180 from pdf/diskstats_linux_bytes_read_written
Calculate Linux disk bytes read/written based on sector size
2015-12-28 00:10:54 +00:00
Peter Fern
09e610ad37 Calculate Linux disk bytes read/written based on sector size (512B)
Logical sector size appears to be fixed at 512B for the foreseeable
future in the kernel, so for now we just hard-code it.
2015-12-27 22:00:02 +11:00
Tobias Schmidt
6af5273937 Update Makefile.COMMON 2015-12-21 16:28:12 +01:00
Brian Brazil
e632f2e83d Merge pull request #179 from prometheus/conntrack
Add linux conntrack collector.
2015-12-21 11:41:12 +00:00
Brian Brazil
a82b4c30cb Add linux conntrack collector. 2015-12-20 00:57:52 +00:00
Julius Volz
613f531280 Merge pull request #174 from audebert/systemd
collector: add systemd services status
2015-12-19 16:19:19 +01:00
Rémi Audebert
8628d60125 collector: systemd: collect whether the system is operational 2015-12-19 13:54:20 +01:00
Rémi Audebert
87ccaa39c9 collector: add systemd 2015-12-19 13:54:20 +01:00
Julius Volz
3d7658eea5 Merge pull request #178 from prometheus/cpu
Do a make format run.
2015-12-19 09:22:16 +01:00
Brian Brazil
2f0d697f8c Do a make format run. 2015-12-18 14:08:52 +00:00
Brian Brazil
514f5ad4a9 Merge pull request #177 from prometheus/cpu
Switch linux stat to using ConstMetric
2015-12-18 13:36:06 +00:00
Brian Brazil
7739fb4e12 Switch linux stat to using ConstMetric 2015-12-18 12:28:51 +00:00
Tobias Schmidt
1384becb12 Merge pull request #167 from pborzenkov/filter-collectors
Filter list of collectors enabled by default
2015-11-13 14:34:37 -08:00
Brian Brazil
6e20d89467 Merge pull request #169 from pborzenkov/ntp-fix-missing-arg
Add missing argument to fmt.Errorf function in 'ntp' collector
2015-11-13 15:13:02 +00:00
Pavel Borzenkov
d773360d12 Add missing argument to fmt.Errorf function in 'ntp' collector
Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
2015-11-13 18:09:11 +03:00
Pavel Borzenkov
46527808aa Filter list of collectors enabled by default
Enabled by default collectors are chosen for Linux, which supports all
of the implemented collectors. But for other OSes (OS X, for example)
this list is not suitable, because they lack most of those collectors.

Because of that, it is not possible to run node_exporter with default
options on such OSes. Fix this by filtering list of enabled by default
collectors based on their availability for current platform.

Closes #149

Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
2015-11-13 10:42:10 +03:00
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