Julius Volz
f667a5d01a
Merge pull request #58 from benley/google-code-sadface
...
Switch protobuf import to its new github URL
2015-03-22 21:16:39 +01:00
Benjamin Staffin
df7ba0af85
Switch protobuf import to its new github URL
2015-03-22 12:25:07 -07:00
Julius Volz
76e146119f
Merge pull request #57 from prometheus/travis-link
...
Link Travis badge to Travis build status page.
2015-03-21 17:36:59 +01:00
Julius Volz
1bb9adb5f1
Link Travis badge to Travis build status page.
2015-03-21 11:32:18 +01:00
Julius Volz
c164557cba
Wording/punctuation improvement in README.md.
2015-03-21 11:27:43 +01:00
Julius Volz
393d62ab9e
Merge pull request #55 from franklinwise/autobuild-patch
...
added travis automated build and status on the readme
2015-03-20 12:14:40 +01:00
Franklin Wise
204fe46a62
removed go versions, and added make test, as per juliusv request
2015-03-19 10:59:04 -07:00
Franklin Wise
4b53465c14
added travis automated build and status on the readme
2015-03-18 19:04:29 -07:00
Julius Volz
aaf01e52e2
Merge pull request #54 from prometheus/common-make
...
Use Makefile.COMMON and release version 0.8.0.
2015-03-09 19:23:48 +01:00
Julius Volz
b3e5a8e046
Release version 0.8.0 and introduce changelog.
2015-03-09 19:16:10 +01:00
Julius Volz
cdf83741c2
Use Makefile.COMMON in node exporter.
2015-03-09 19:14:42 +01:00
Julius Volz
30cf7f8c73
Merge pull request #53 from prometheus/web-pprof
...
Remove memprofile file, add pprof HTTP endpoint instead.
2015-03-05 22:58:31 +01:00
Julius Volz
a730cff002
Remove memprofile file, add pprof HTTP endpoint instead.
2015-03-05 17:08:59 +01:00
Julius Volz
0c8bfba04d
Merge pull request #47 from prometheus/flag-cleanup
...
Make collector-specific flags consistent with others.
2015-02-18 18:43:32 +01:00
Julius Volz
efcce45c90
Make collector-specific flags consistent with others.
...
This puts all collector-specific flags into their own namespace under
"collector.<collector-name>", and moves from camel case to dashes, which
is the standard in Prometheus land now.
2015-02-18 18:42:39 +01:00
Brian Brazil
9775276b29
Merge pull request #46 from kormat/master
...
Match fd0, not fda0
2015-02-18 16:12:25 +00:00
Stephen Shirley
54da76f575
Match fd0, not fda0
...
Add fd/sr/vda examples to test input
2015-02-18 17:10:28 +01:00
Brian Brazil
79bde79d50
Merge pull request #45 from kormat/master
...
Ignore floppy disk devices, due to it being 2015
2015-02-18 15:13:36 +00:00
Stephen Shirley
686a0c768c
Fix typo, match fd0, not fdd0
2015-02-18 16:09:41 +01:00
Stephen Shirley
72404d9ed1
Ignore floppy disk devices, due to it being 2015
2015-02-18 16:04:53 +01:00
Brian Brazil
6b5a1e797e
Merge pull request #44 from kormat/master
...
Also ignore vda1 and friends
2015-02-18 14:56:55 +00:00
Stephen Shirley
0c7d45cc5d
Also ignore vda1 and friends
2015-02-18 15:44:30 +01:00
juliusv
8f013ba8df
Merge pull request #43 from prometheus/discordianfish-patch-1
...
Fix port in Dockerfile
2015-02-10 13:21:15 +01:00
Johannes 'fish' Ziemke
cdcb0576a2
Fix port in Dockerfile
2015-02-10 12:41:51 +01:00
juliusv
8c86a752c7
Merge pull request #42 from prometheus/readme-makefile-update
...
Add tests and run info to README.md and Makefile.
2015-02-09 22:51:00 +01:00
Julius Volz
effc934777
Add tests and run info to README.md and Makefile.
2015-02-09 22:42:23 +01:00
juliusv
646d8de896
Merge pull request #40 from prometheus/flag-cleanup
...
Make flag names consistent across projects.
2015-02-09 12:25:13 +01:00
juliusv
12c1caacee
Fix typo in README.md
2015-02-09 12:00:05 +01:00
Brian Brazil
86ddd0a1a8
Merge pull request #41 from brian-brazil/readme
...
Flesh out readme.
2015-02-09 10:51:18 +00:00
Brian Brazil
6ee77bd00a
Flesh out readme.
2015-02-09 10:50:20 +00:00
Julius Volz
0283fc9ab8
Make flag names consistent across projects.
2015-02-09 00:23:56 +01:00
Tobias Schmidt
5bf5eef004
Merge pull request #39 from DSpeichert/master
...
Fixed panic when parsing /proc/stat on 2.6.32-25-pve
2015-02-07 04:39:13 -05:00
Daniel Speichert
1763908013
Fixed panic when parsing /proc/stat on 2.6.32-25-pve
...
Fixes issue described in #38
/proc/stat reports a blank line which needs to be ignored.
Old kernels misses one CPU time field, this needs to be ignored too.
2015-02-07 06:36:36 +01:00
juliusv
202bbe16fd
Merge pull request #37 from prometheus/arch-os-build-fixes
...
Fix Go download link for several archs and OSes.
2015-02-05 18:08:53 +01:00
Julius Volz
225b88bc31
Fix Go download link for several archs and OSes.
2015-02-05 16:54:53 +01:00
juliusv
968552845f
Merge pull request #36 from fabxc/master
...
fix go tarball download for OS X, use redirect from golang.org
2015-01-31 22:57:05 +01:00
Fabian Reinartz
59f9faf416
Use https:// GOURL
2015-01-31 22:46:42 +01:00
Fabian Reinartz
52b6911c52
fix go tarball download for OS X, use redirect from golang.org
2015-01-31 22:00:15 +01:00
juliusv
f61f2784a6
Merge pull request #35 from brian-brazil/textfile
...
Add text file exporter
2015-01-26 13:19:36 +01:00
Brian Brazil
352cde6d20
Add text file exporter
...
This allows static metrics (e.g. an attributes collector replacement),
and cronjobs to expose stats by echoing into a file.
For example:
echo "my_metric 123" > mycronjob.prom.$$
mv mycronjob.prom.$$ mycronjob.prom
2015-01-25 16:25:25 +00:00
juliusv
1b1c14c47b
Merge pull request #34 from brian-brazil/hermetic
...
Make build hermetic.
2015-01-25 16:33:08 +01:00
Brian Brazil
a9fdaf184c
Make build hermetic.
...
This makes a simple 'make' work on a machine without golang,
and doesn't pull in libraries from elsewhere.
Bump golang version, 1.3 doesn't do http basic auth.
2015-01-25 12:43:10 +00:00
juliusv
7abcf32621
Merge pull request #33 from prometheus/beorn7/license-cleanup
...
License cleanup
2015-01-22 17:51:46 +01:00
Bjoern Rabenstein
e03ed0aedf
License cleanup
2015-01-22 17:11:26 +01:00
juliusv
b3475f7a06
Merge pull request #32 from brian-brazil/homepage
...
Add simple home page to node exporter.
2015-01-09 15:38:09 +01:00
Brian Brazil
b50da59ee6
Add simple home page to node exporter.
2015-01-09 14:36:49 +00:00
Björn Rabenstein
6d7e08e78b
Merge pull request #31 from prometheus/simplify-dockerfile
...
Simplify Dockerfile by using golang:onbuild image
2014-12-18 14:29:26 +01:00
juliusv
e4abdece01
Merge pull request #30 from prometheus/make-config-optional
...
Make config optional
2014-12-18 14:22:01 +01:00
Johannes 'fish' Ziemke
13e9b5ee8b
Simplify Dockerfile by using golang:onbuild image
2014-12-18 13:18:03 +01:00
juliusv
318203921f
Merge pull request #29 from prometheus/add-basic-auth
...
Add Basic Auth support
2014-12-18 12:59:59 +01:00