Commit Graph

843 Commits

Author SHA1 Message Date
Brian Brazil
3853d9f0a6 Merge pull request #208 from problame/freebsd
Add FreeBSD 'cpu' exporter to default collectors.
2016-02-18 12:37:27 +00:00
Christian Schwarz
9a189b903e Add FreeBSD 'cpu' exporter to default collectors.
As of `1fc84e2fb69ee3d1f063399b00a6284fc8e27cb8` it does not require root anymore.
2016-02-18 12:15:08 +01:00
Julius Volz
276d626616 Merge pull request #207 from problame/freebsd
Re-implement CPU metrics collection through sysctls.
2016-02-17 15:47:22 +01:00
Christian Schwarz
1fc84e2fb6 Re-implement CPU metrics collection through sysctls.
This removes the requirement to run `node_exporter` as root or with read
access to `/dev/kmem` in order to get CPU usage statistics.

Once FreeBSD adds a macro for the `kern.cp_times` sysctl, the
`setupSysctlMIBs()` function should be replaced by usage of the macro.
2016-02-17 15:39:21 +01:00
Christian Schwarz
2ca6280b82 Fix compile error on FreeBSD
When compiling `20ecedd0b4c983bd7b88f97cd7a21461988a6c12` with GNU make (`gmake`) on FreeBSD 10.2-RELEASE, I get the following error:

```
collector/filesystem_bsd.go:60: non-bool mnt[i].f_flags & MNT_RDONLY (type C.uint64_t) used as if condition
Makefile.COMMON:85: recipe for target 'node_exporter' failed
gmake: *** [node_exporter] Error 2
```

This problem is fixed by this patch.
2016-02-17 15:39:21 +01:00
Brian Brazil
e269be1a2a Merge pull request #206 from problame/patch-1
Fix compile error on FreeBSD
2016-02-16 14:31:26 +00:00
Christian Schwarz
a40bdcaa36 Fix compile error on FreeBSD
When compiling `20ecedd0b4c983bd7b88f97cd7a21461988a6c12` with GNU make (`gmake`) on FreeBSD 10.2-RELEASE, I get the following error:

```
collector/filesystem_bsd.go:60: non-bool mnt[i].f_flags & MNT_RDONLY (type C.uint64_t) used as if condition
Makefile.COMMON:85: recipe for target 'node_exporter' failed
gmake: *** [node_exporter] Error 2
```

This problem is fixed by this patch.
2016-02-16 13:35:08 +01:00
Brian Brazil
fddc67bda6 Merge pull request #205 from cagedmantis/cagedmantis/fix-typo-in-error-msg
fix a small typo in an error message
2016-02-10 09:26:51 +00:00
Carlos Amedee
8578a3281a fix a small typo in an error message. 2016-02-09 23:22:29 -05:00
Brian Brazil
ca050b599d Merge pull request #204 from pborzenkov/centos6-meminfo-numa-fix
meminfo_numa: fix crash on CentOS 6 kernel
2016-02-06 13:17:34 +00:00
Pavel Borzenkov
5a085dcaf5 meminfo_numa: fix crash on CentOS 6 kernel
It turns out, on some kernels (notably - CentOS6) there is an empty line
inserted at the beginning of /sys/devices/system/node/node*/meminfo
files.  The leads to node_exporter crash on such kernels.

Fix this by checking for empty string first.

Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
2016-02-06 16:11:49 +03:00
Tobias Schmidt
3a96e6881b Remove unused flag -debug.memprofile-file
The option to write out a memory profile to file was removed in a730cff.
Declaring flags as local variable does not only result in cleaner, more
testable code, but also ensures that the program won't compile anymore
when unused flags are left in place.
2016-02-04 20:24:16 -05:00
Matthias Rampke
20ecedd0b4 And one more, because I don't know how to version. 2016-02-04 12:43:50 +00:00
Matthias Rampke
1cdea5196e Release 0.12.0rc2. 2016-02-04 12:41:05 +00:00
Tobias Schmidt
a05966a3a9 Update Makefile.COMMON
Go expects to build a project from a location like
`.../src/github.com/prometheus/node_exporter`.
2016-01-25 11:57:56 -05:00
Tobias Schmidt
b30806ef41 Merge pull request #200 from prometheus/document-availability
Document os support of each collector
2016-01-21 19:41:34 -05:00
Tobias Schmidt
e2163db0f7 Document os support of each collector 2016-01-21 19:36:58 -05:00
Tobias Schmidt
33f99c4fc1 Vendor all dependencies
Uses godep to vendor dependencies. Godeps is not necessary during build,
golang's new vendor support is used instead.
2016-01-21 16:41:53 -05:00
Tobias Schmidt
041de0e30c Fix go format style in filesystem collector 2016-01-21 16:20:32 -05:00
Tobias Schmidt
d1f0f2247d Merge pull request #165 from pborzenkov/ksmd-collector
Add new collector exposing 'ksmd' stats
2016-01-21 08:48:47 -05:00
Tobias Schmidt
4d07881b5b Merge pull request #162 from wrouesnel/read_only_flag
Add filesystem read-only metric.
2016-01-21 08:43:54 -05:00
Pavel Borzenkov
0e78ed63a6 Add new collector exposing 'ksmd' stats
Add new collector which exposes the content of /sys/kernel/mm/ksm
directory. This directory contains control and statistics files for
Kernel Samepage Merging daemon.

The collector is not enabled by default.

Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
2016-01-21 13:43:22 +03:00
Tobias Schmidt
c47c011063 Fix go format style in mdadm collector 2016-01-21 00:44:07 -05:00
Tobias Schmidt
f6f4fda1aa Merge pull request #168 from pborzenkov/per-numa-meminfo
Add new per NUMA node memory statistics collector
2016-01-20 23:43:24 -05:00
afefelov
00e1db52bb Fix mdstat for devices in delayed resync state
In some raid configurations resync will be delayed for devices allocated
on the same physiclal units.

Fixes #170.
2016-01-20 23:35:39 -05:00
Tobias Schmidt
f261b788d2 Update Makefile.COMMON 2016-01-20 22:19:31 -05:00
Tobias Schmidt
e12241aac2 Merge pull request #196 from juergenhoetzel/freebsd_arm_fixes
Freebsd arm fixes
2016-01-19 13:53:15 -05:00
Juergen Hoetzel
4c909d4793 Disable compilation of vmstat on !Linux target OS 2016-01-19 17:43:02 +01:00
Juergen Hoetzel
e3437dc583 Fix build on 32-bit architectures 2016-01-19 17:21:47 +01:00
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
Pavel Borzenkov
c12d8ea927 Add new per NUMA node memory statistics collector
It is sometimes useful to understand the distribution of free/occupied
memory between NUMA nodes to deal with performance problems. To do so,
add new meminfo_numa collector that enables exporting of per node
statistics along with unit and end-to-end tests for it.

Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
2016-01-15 15:04:27 +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