Commit Graph

537 Commits

Author SHA1 Message Date
stuart nelson
57f88ac4f6 Update comment 2016-09-19 09:48:53 +02:00
stuart nelson
78c84b1a47 Remove old freq finding code
This is the code that was lifted from the freebsd
implementation, but was not correct.
2016-09-19 09:48:34 +02:00
stuart nelson
45ac033d9e Use correct frequency for calculating cpu time
The correct frequency is the systimer frequency,
not the stathz.

From one of the DragonFly developers:

The bump upon each statclock is:
((cur_systimer - prev_systimer) * systimer_freq) >> 32

systimer_freq can be extracted from following
sysctl in userspace:
sysctl kern.cputimer.freq
2016-09-19 09:35:41 +02:00
stuart nelson
8cc06aab04 Remove unneeded ncpu variable 2016-09-18 17:36:39 +02:00
stuart nelson
9f7822ccdc Remember to bzero string
Duplication was caused by malloc returning a
region of memory that already had data in it.
2016-09-18 16:17:49 +02:00
stuart nelson
c02dcdeb35 Remove unused comment. 2016-09-18 14:21:54 +02:00
stuart nelson
3e4a154656 Correctly exporting values
Moved to exporting via a string, which is then
split and parsed.

The string is sometimes duplicated, however.
2016-09-18 14:16:26 +02:00
Ben Kochie
64b82596ef Fix mdadm collector for resync=PENDING.
Add fix for mdadm devices in state `resync=PENDING`.
* Update test and fixture.
2016-09-18 08:30:20 +02:00
stuart nelson
4b4385bd44 Remove free
Don't need it since we aren't malloc'ing
2016-09-17 19:14:31 +02:00
stuart nelson
cc5142a007 Remove some unnecessary includes 2016-09-17 19:13:05 +02:00
stuart nelson
a9d27ea722 Appears to be working? Still need to cleanup after self 2016-09-17 18:50:08 +02:00
stuart nelson
1d75b376ae checkpoint 2016-09-17 14:43:29 +02:00
stuart nelson
1b7a18c271 Creating slice from C-array
Might not be lined up correctly? Weird output data
in the second CPU.
2016-09-17 14:05:36 +02:00
stuart nelson
61f36ac1ab Activate filesystem collector on DragonFly (#302) 2016-09-11 12:08:00 -04:00
stuart nelson
03da1ea516 successfully exporting one of 2 cpus 2016-09-10 21:13:06 +02:00
stuart nelson
cda2f493ee wip 2016-09-10 19:22:34 +02:00
Steve Durrheimer
3fb4d99051 Merge pull request #301 from prometheus/sdurrheimer-promu-improvements
Update promu config file following recent changes + use the golang-bu…
2016-09-09 10:04:03 +02:00
Steve Durrheimer
70eba4b20c
circle: add tag v-prefix 2016-09-09 08:44:09 +02:00
Steve Durrheimer
4fd1b1d571
Update promu config file following recent changes + use the golang-builder base image for tests for CircleCI 2016-09-09 08:33:09 +02:00
Ben Kochie
1549f3087d Merge pull request #294 from prometheus/sdurrheimer-use-promu-default-go-version
Use promu default go version + use 1.6 tag for cicleci tests
2016-08-31 09:00:12 +02:00
Steve Durrheimer
db0042152b
Use promu default go version + use 1.6 tag for cicleci tests 2016-08-30 09:32:05 +02:00
Takuya Nakaike
0f2a87ab22 add s390x support 2016-08-24 08:06:04 -04:00
Julius Volz
4932fcaa2e Merge pull request #286 from carlpett/systemd-collector-filtering
Add ignored-units flag for systemd collector
2016-08-20 20:37:49 +02:00
Calle Pettersson
e890743f79 Add white/blacklisting of units for systemd collector 2016-08-20 13:08:03 +02:00
Julius Volz
428746c48e Merge pull request #285 from prometheus/meminfo-bsd-constmetrics
Convert BSD meminfo collector to use ConstMetrics
2016-08-14 20:14:13 +02:00
Julius Volz
f0796683fe Convert BSD meminfo collector to use ConstMetrics
This suffers from the same concurrency bug as the netstat one:
https://github.com/prometheus/node_exporter/issues/280
2016-08-13 00:40:29 +02:00
Julius Volz
c0b46391e2 Merge pull request #283 from prometheus/meminfo-constmetrics
Convert meminfo collector to use ConstMetrics
2016-08-12 19:02:30 +02:00
Brian Brazil
25289c5024 Merge pull request #284 from prometheus/sockstat-constmetrics
Convert sockstat collector to use ConstMetrics
2016-08-12 00:42:23 +01:00
Julius Volz
cef3d98256 Convert sockstat collector to use ConstMetrics
This suffers from the same concurrency bug as the netstat one:
https://github.com/prometheus/node_exporter/issues/280
2016-08-12 01:36:42 +02:00
Brian Brazil
1001548e43 Merge pull request #282 from prometheus/filefd-constmetrics
Convert filefd collector to use ConstMetrics
2016-08-12 00:33:59 +01:00
Julius Volz
eac396c637 Convert meminfo collector to use ConstMetrics
This suffers from the same concurrency bug as the netstat one:
https://github.com/prometheus/node_exporter/issues/280
2016-08-12 01:30:15 +02:00
Julius Volz
f91bca427b Convert filefd collector to use ConstMetrics
This suffers from the same concurrency bug as the netstat one:
https://github.com/prometheus/node_exporter/issues/280
2016-08-12 01:26:25 +02:00
Julius Volz
9128952454 Fix end-to-end tests after netstat conversion 2016-08-12 01:09:20 +02:00
Julius Volz
55761fc788 Merge pull request #281 from prometheus/netstat-const-metrics
Convert netstat collector to use ConstMetrics
2016-08-12 00:57:02 +02:00
Julius Volz
8c5c880705 Convert netstat collector to use ConstMetrics
Fixes https://github.com/prometheus/node_exporter/issues/280
2016-08-12 00:34:00 +02:00
Julius Volz
b55019f10b Merge pull request #275 from thomasf/mdstat-tabs
Fix mdstat tabs parsing
2016-08-06 14:22:31 +02:00
Thomas Frössman
32e3445d72 Fix mdstat tabs parsing 2016-08-06 14:08:11 +02:00
Björn Rabenstein
d48453a61a Merge pull request #268 from h3po/patch-1
Ignore partitions on NVME devices by default
2016-07-11 23:12:42 +02:00
Daniel
c3eba340e3 Update e2e-output.txt 2016-07-09 15:36:52 +02:00
Daniel
87b3df90e6 Update diskstats 2016-07-09 15:23:31 +02:00
Daniel
a7a8d088da Ignore partitions on NVME devices by default
The convention of the linux driver is nvme($device)n($namespace)p($partition). On *bsd it seems to be different, using "ns" instead of "n" as the namespace separator.
2016-07-09 13:23:01 +02:00
Brian Brazil
f660b32f08 Merge pull request #267 from mgit-at/sockstat-rhe4
sockstat: add support for RHE4
2016-07-07 21:30:23 +01:00
Johannes 'fish' Ziemke
3f19ee6f02 Merge pull request #266 from prometheus/fish/darwin-enable-meminfo
Use meminfo_freebsd on darwin as well
2016-07-06 14:08:56 +02:00
Johannes 'fish' Ziemke
7e5aaa9e33 Use meminfo_freebsd on darwin as well 2016-07-06 12:12:16 +02:00
Johannes 'fish' Ziemke
6350ef6d17 Merge pull request #265 from prometheus/fish/darwin-filesystem-stats
Enable *bsd collector on darwin
2016-07-06 10:46:39 +02:00
Johannes 'fish' Ziemke
4b04d04558 Enable *bsd collector on darwin 2016-07-06 10:24:20 +02:00
Michael Gebetsroither
4b820427dd sockstat: add support for RHE4 2016-07-05 23:24:54 +02:00
Brian Brazil
157ac23b4d Merge pull request #263 from slene/master
Close file handler in textfile
2016-06-29 19:07:09 +01:00
slene
dea279267a Close file handler in textfile 2016-06-30 00:06:51 +08:00
Björn Rabenstein
49f562136d Merge pull request #258 from knweiss/filefd
filefd collector
2016-06-20 19:50:12 +02:00