mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-14 17:44:06 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
2438 commits 248 branches 440 tags 657 MiB
Commit graph

2438 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julius Volz acd2df7507 Merge pull request #725 from prometheus/fabxc/testflags 
Remove test flags in help output
 2015-05-23 13:15:46 +02:00
Julius Volz bab1ae3a48 Merge pull request #717 from gesellix/add-hostname-flag 
allow to override the default os.Hostname() when creating PrometheusURLs
 2015-05-23 13:05:58 +02:00
Tobias Gesellchen 84d42f48e5 allow to override the default os.Hostname() when creating PrometheusURLs 2015-05-23 12:59:38 +02:00
Julius Volz fcd33bbfd8 Improve web redirection and 404 behavior. 
Previously we redirected any non-existent path to the root (or path
prefix).

The new behavior:

With no path prefix:

- "" -> "/"
- "/biz" -> 404

With path prefix of "/foo/bar":

- "" -> "/foo/bar/"
- "/" -> "/foo/bar/"
- "/foo/bar" -> "/foo/bar/"
- "/biz" -> /foo/bar/biz"
  (anything not starting with the path prefix gets the prefix prepended)
- "/foo/bar/biz" -> 404
 2015-05-23 12:46:16 +02:00
Fabian Reinartz b7eb105ffa Remove test flags in help output 2015-05-23 12:23:33 +02:00
Fabian Reinartz db2a0e17c5 Merge pull request #723 from prometheus/fabxc/gitign 
Ignore YAML files
 2015-05-23 11:42:20 +02:00
Fabian Reinartz b29b4f1ee9 Ignore YAML files 2015-05-23 11:20:14 +02:00
Julius Volz 52ef225b83 Merge pull request #720 from prometheus/update-docker-file-yml-change 
Rename refs to prometheus.conf -> prometheus.yml and remove logtostderr flag
 2015-05-22 18:09:17 +02:00
Johannes 'fish' Ziemke 6a2983c615 Rename refs to prometheus.conf -> prometheus.yml 2015-05-22 15:25:18 +00:00
Fabian Reinartz 25ce5f8667 Merge pull request #719 from prometheus/update-vendoring 
Update all vendored dependency to latest versions.
 2015-05-22 14:10:24 +02:00
Björn Rabenstein 52c401a4a3 Merge pull request #718 from prometheus/beorn7/doc 
Update README.md.
 2015-05-22 13:49:12 +02:00
Julius Volz a7229565e6 Update all vendored dependency to latest versions. 2015-05-22 13:45:14 +02:00
beorn7 d989415c42 Update README.md. 2015-05-22 13:43:20 +02:00
Fabian Reinartz 9268bf9d36 Merge pull request #715 from prometheus/fabxc/0.14.0-rc1 
Cut 0.14.0-rc1
 2015-05-21 21:54:06 +02:00
Fabian Reinartz 1b96163b4e Cut 0.14.0rc1 2015-05-21 21:43:27 +02:00
Julius Volz 388a08bd5e Merge pull request #714 from prometheus/beorn7/instrumentation 
Add metrics to count inconsistencies and fp collisions.
 2015-05-21 18:48:38 +02:00
beorn7 3b9ab546e6 Add metrics to count inconsistencies and fp collisions. 2015-05-21 18:46:20 +02:00
Björn Rabenstein c44e7cd105 Merge pull request #706 from prometheus/beorn7/persistence2 
Improve iterator performance.
 2015-05-21 13:48:52 +02:00
Julius Volz a19e6b39d0 Merge pull request #713 from prometheus/fabxc/atomic_align 
Align int64s for atomic operations
 2015-05-21 11:52:42 +02:00
Fabian Reinartz 112a778922 Align int64s for atomic operations 2015-05-21 01:38:50 +02:00
Julius Volz d4bd3397ae Merge pull request #712 from prometheus/fabxc/def_cfg_file 
Change default config file name
 2015-05-20 23:02:14 +02:00
Fabian Reinartz 7227b02413 Merge pull request #711 from prometheus/new-logging 
Switch Prometheus to use github.com/prometheus/log.
 2015-05-20 22:01:07 +02:00
Fabian Reinartz 223eaf2ca3 Change default config file name 2015-05-20 19:24:27 +02:00
beorn7 3b9c421a69 Weed out all the [Gg]et* method names. 
The only exception is getNumChunksToPersist to avoid naming the struct
member numChunksToPersist in a weird way.
 2015-05-20 19:13:06 +02:00
Julius Volz 267fd34156 Switch Prometheus to use github.com/prometheus/log. 
This change is conceptually very simple, although the diff is large. It
switches logging from "github.com/golang/glog" to
"github.com/prometheus/log", while not actually changing any log
messages. V(1)-style logging has been changed to be log.Debug*().
 2015-05-20 18:19:32 +02:00
Julius Volz 572b280cf0 Merge pull request #710 from prometheus/fix-godeps-json 
Remove extra trailing commas in Godeps.json.
 2015-05-20 17:42:30 +02:00
Julius Volz 9c0908fabb Remove extra trailing commas in Godeps.json. 2015-05-20 17:03:30 +02:00
beorn7 81b190bf45 Remove locking from series iterator. Cache chunk iterators. 2015-05-20 16:19:34 +02:00
beorn7 cd5574bf8a Make chunk and series iterators more efficient. 2015-05-20 16:19:34 +02:00
beorn7 f79c694be5 Add benchmarks for series iterator methods. 2015-05-20 16:19:34 +02:00
Björn Rabenstein 6586b15367 Merge pull request #709 from prometheus/fabxc/storage_test_fix 
Fix storage test
 2015-05-20 16:13:15 +02:00
Fabian Reinartz f59a449a24 Fix storage test 2015-05-20 16:12:07 +02:00
Fabian Reinartz 8c1c840429 Merge pull request #708 from prometheus/fabxc/servdisc 
Service discovery and more
 2015-05-20 15:56:35 +02:00
Fabian Reinartz e2ed921505 Merge branch 'master' into fabxc/servdisc 2015-05-20 14:13:08 +02:00
Julius Volz 7af85f980c Merge pull request #707 from abraithwaite/source-tar-build 
Makefile: allow building from source without git
 2015-05-20 13:55:28 +02:00
Julius Volz 984c2ae6ea Merge pull request #698 from prometheus/fabxc/consul_sd 
Add initial implementation for SD via Consul.
 2015-05-20 12:43:17 +02:00
Fabian Reinartz 7143dff02f Add initial implementation for SD via Consul. 
This commit adds service discovery using Consul's HTTP API and watches
(long polling) to retrieve target updates.
 2015-05-20 11:46:24 +02:00
Fabian Reinartz b0c181dc0d Add Consul SD configuration. 2015-05-20 11:46:24 +02:00
Fabian Reinartz ab4e3ee594 Add consul api package to godeps. 2015-05-20 11:42:17 +02:00
Fabian Reinartz ea62fce5f1 Merge pull request #705 from prometheus/fabxc/file_label 
Attach __meta_filepath label to file SD targets.
 2015-05-20 11:28:30 +02:00
Alan Braithwaite 80986e0dda Makefile: allow building from source without git 
This allows for building from a source tarball/zip using
VERSION=$VERSION make build
 2015-05-19 22:50:04 -07:00
Fabian Reinartz a703241bf8 Adjust example config to naming changes 2015-05-19 18:12:58 +02:00
Fabian Reinartz a216b1cb27 Merge pull request #704 from prometheus/fabxc/cfg_check 
Clean storage shutdown on startup errors, require initial config
 2015-05-19 16:50:05 +02:00
Fabian Reinartz ff832d2e03 Attach __meta_filepath label to file SD targets. 2015-05-19 15:49:38 +02:00
Fabian Reinartz ec9c51ab98 Fix old template naming 2015-05-19 15:40:41 +02:00
Fabian Reinartz 5d3024fd3e Restructure component initialization 2015-05-19 14:41:47 +02:00
Fabian Reinartz d8440d75f1 Do not start storage processing before Start() is called. 2015-05-19 13:51:45 +02:00
Julius Volz b503628545 Merge pull request #702 from mtanda/fix_graph_link 
Fix graph links when "web.path-prefix" option is set
 2015-05-19 13:16:34 +02:00
Fabian Reinartz 198c68045d Merge pull request #703 from prometheus/fabxc/testtime 
Increase target test wait times
 2015-05-19 12:15:36 +02:00
Fabian Reinartz 8de50619f1 Increase target test wait times 
On slow systems such as Travis CI occasionally the tests fail
because the wait times are too short.
 2015-05-19 12:06:52 +02:00