Commit Graph

370 Commits

Author SHA1 Message Date
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
Matthias Rampke
011ae2db3f update travis
* use new Travis infrastructure
* specify Go versions (1.4.3, 1.5.1, tip)
* bypass the makefile to really build with all versions
2015-09-26 18:28:30 +02:00
Matthias Rampke
a4c7fc02bc Merge pull request #123 from matthiasr/add-license-headers
Add license headers to all code files.
2015-09-26 18:23:50 +02:00
Matthias Rampke
2d0d72b97d Add license headers to all code files. 2015-09-26 17:44:39 +02:00
Matthias Rampke
7940efe157 Merge pull request #121 from matthiasr/procfs-flag
Add flag to change the location of the procfs.
2015-09-26 17:22:49 +02:00
Matthias Rampke
20b551ab2b Add flag to change the location of the procfs.
Remove all hardcoded references to `/proc`. For all collectors that do
not use `github.com/prometheus/procfs` yet, provide a wrapper to
generate the full paths.

Reformulate help strings, errors and comments to remove absolute
references to `/proc`.

This is a breaking change: the `-collector.ipvs.procfs` flag is removed
in favor of the general flag. Since it only affected that collector it
was only useful for development, so this should not cause many issues.
2015-09-26 15:32:10 +02:00
Björn Rabenstein
cf3aa37f1a Merge pull request #120 from prometheus/move-to-common
Move from client_golang/text to common/expfmt
2015-09-17 14:38:27 +02:00
beorn7
8f182d2f02 Move from client_golang/text to common/expfmt 2015-09-17 14:05:56 +02:00
Julius Volz
7de03b8d6b Merge pull request #119 from AlphaB/issue-95
Resolve go vet problems
2015-09-17 11:44:46 +02:00
Björn Rabenstein
ca74e8ab3e Merge pull request #117 from TheTincho/forget-old-filesystems
Revamp the filesystem collector to use throw-away ConstMetrics.
2015-09-16 17:31:06 +02:00
Martín Ferrari
e3f217ea45 Build filesystem_common only on linux and freebsd. 2015-09-16 18:15:27 +03:00
Julius Volz
d8bf6daed9 Merge pull request #118 from TheTincho/forget-old-netdevs
Revamp the netdev collector to use throw-away ConstMetrics.
2015-09-16 16:36:16 +02:00
Martín Ferrari
0161a36fa5 Fix formatting and variable names. 2015-09-16 17:06:59 +03:00
Martín Ferrari
dace6dc48b Fix issues from code review, and split common code into filesystem_common.go. 2015-09-16 16:34:34 +03:00
Julius Volz
ba52f63fe8 Merge pull request #116 from AlphaB/runit-state-change-time
Add the time of the last service state change to runit collector
2015-09-16 10:19:34 +02:00
Mikhail Salosin
e41593de14 Add unix timestamp of the last service state change to runit collector 2015-09-15 19:46:59 +03:00
Martín Ferrari
13672ced48 Revamp the netdev collector to use throw-away ConstMetrics. 2015-09-15 15:31:51 +00:00
Mikhail Salosin
741fb66e1c Resolve go vet problems
Issue prometheus/node_exporter#95
2015-09-15 17:09:10 +03:00
Martín Ferrari
8c2316e8a9 Revamp the filesystem collector to use throw-away ConstMetrics. 2015-09-15 12:17:15 +00:00
Fabian Reinartz
efe09051dc Merge pull request #115 from cherti/authors
filled authors
2015-09-14 20:23:52 +02:00
Jonas Große Sundrup
c7acb4bc74 filled authors 2015-09-14 20:07:19 +02:00
Julius Volz
e180b882d6 Add missing period in README.md. 2015-09-11 20:15:23 +02:00
Julius Volz
a10f5b8093 Merge pull request #109 from cherti/mdadm
adding collector for linux-mdadm-software-raid
2015-09-11 20:08:21 +02:00
Jonas Große Sundrup
9f2aa24e12 Add collector for metrics of linux software raids 2015-09-11 18:36:39 +02:00
Brian Brazil
d8c99d8728 Merge pull request #113 from prometheus/uname-collector
Add Linux uname collector.
2015-09-11 13:38:00 +01:00
Julius Volz
7b39ccc144 Add Linux uname collector.
This creates a single metric like:

node_uname_info{domainname="(none)",machine="x86_64",nodename="desktop",release="3.16.0-48-generic",sysname="Linux",version="#64~14.04.1-Ubuntu SMP Thu Aug 20 23:03:57 UTC 2015"} 1
2015-09-11 14:32:18 +02:00
Julius Volz
02956d2bcc Merge pull request #114 from chosenken/sockstat
Fixed sockstat test wording
2015-09-10 17:15:21 +02:00
Julius Volz
c4fe5b8c23 Merge pull request #110 from chosenken/file-nr
Add collecting /proc/sys/fs/file-nr
2015-09-10 17:13:07 +02:00
Ken Herner
7569c6ce23 Initial implementation of file-nr
Fixed file-nr update function

Fixed file-nr test case

Fixed file-nr test case again

Fixed file-nr separator to tab

Updated file-nr to filenr.

Updated file-nr to filenr.

Fixed file-nr test cases, added comments

Remove reporting the second value from file-nr as it will alwasy be zero in linux 2.6 and greator

Renaming file-nr to filefd

Updated build constraint

Updates and code cleanup for filefd.

Updated enabledCollectors with the correct name for filefd

Fixed filefd test wording
2015-09-10 10:27:58 -04:00
Ken Herner
d6a1f0c7e3 Fixed sockstat test wording 2015-09-10 10:21:19 -04:00
Julius Volz
6f17231e44 Minor comment cleanups. 2015-09-10 12:21:25 +02:00
Julius Volz
dd5fc6a3ca Merge pull request #111 from chosenken/sockstat
Implementation of /proc/net/sockstat collector
2015-09-10 12:19:47 +02:00
Julius Volz
c53fd5521e Merge pull request #105 from eripa/go15
Changed Go version to 1.5.1
2015-09-10 00:31:20 +02:00
Ken Herner
d4adef9881 Added new metric mem_bytes that reports the number of bytes used by TCP/UDP memory 2015-09-09 14:05:16 -04:00