mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 15:09:39 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
1868 commits 243 branches 444 tags 649 MiB
Commit graph

1868 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Fabian Reinartz 2843ff6a0d Merge pull request #701 from prometheus/fabxc/decouple 
Avoid inter-component blocking if ingestion/scraping blocks
 2015-05-19 10:19:05 +02:00
Mitsuhiro Tanda 3e914a8cb1 fix graph links with path prefix 2015-05-19 02:45:05 +09:00
Fabian Reinartz ac4d63b833 Merge pull request #689 from prometheus/fabxc/qltest 
Add basic testing language, migrate tests
 2015-05-18 19:22:48 +02:00
Fabian Reinartz 385919a65a Avoid inter-component blocking if ingestion/scraping blocks. 
Appending to the storage can block for a long time. Timing out
scrapes can also cause longer blocks. This commit avoids that those
blocks affect other compnents than the target itself.
Also the Target interface was removed.
 2015-05-18 17:58:51 +02:00
Fabian Reinartz 0d3012a605 Migrate matrix tests, remove old test files. 2015-05-18 17:50:12 +02:00
Fabian Reinartz 71ef7ab405 Migrate remaining vector evaluation tests to new testing language. 2015-05-18 17:47:47 +02:00
Fabian Reinartz 3c22eded97 Migrate literal tests to testing language. 2015-05-18 17:47:47 +02:00
Fabian Reinartz eba07a7d3d Migrate histogram tests to test language. 2015-05-18 17:47:47 +02:00
Fabian Reinartz 03094eff04 Migrate parsing error tests. 
The promql_test checks failure of various bad syntaxed queries.
Those are moved into the parser tests as the new testing language
only deals with valid queries.
 2015-05-18 17:47:47 +02:00
Fabian Reinartz 6321964738 Add parsing and execution of new test format. 
This commit adds a new test structure that parses and executes
the new testing language.
 2015-05-18 17:47:47 +02:00
Fabian Reinartz a236c01457 Add time series description parsing. 
This commit adds parsing of time series description to the exisiting
query language parser. Time series descriptions are defined by a
metric followed by a sequence of values.
 2015-05-18 17:29:32 +02:00
Fabian Reinartz d122749b39 Enhance lexer testing output 2015-05-18 17:19:17 +02:00
Julius Volz 30b346a430 Merge pull request #700 from prometheus/fabxc/binops 
Improve vector binops evaluation.
 2015-05-18 15:11:18 +01:00
Fabian Reinartz 1a2d57b45c Move template functionality out of target. 
The target implementation and interface contain methods only serving a
specific purpose of the templates. They were moved to the template
as they operate on more fundamental target data.
 2015-05-18 13:35:43 +02:00
Fabian Reinartz dbc08d390e Move target status data into its own object 2015-05-18 11:15:42 +02:00
Fabian Reinartz ce487f763e Simplify vector binary evaluation logic 2015-05-17 00:02:34 +02:00
Fabian Reinartz 8a109e061b Extract OR operation into own eval method. 2015-05-16 14:00:11 +02:00
Fabian Reinartz 2c3e9e2e87 Extract AND operation into own eval method. 2015-05-16 13:33:03 +02:00
Fabian Reinartz 9ca47869ed Provide full SD configs to discovery constructors. 
Some SD configs may have many options. To be readable and consistent, make
all discovery constructors receive the full config rather than the separate
arguments.
 2015-05-15 14:54:29 +02:00
Fabian Reinartz 93548a8882 Add initial file based service discovery. 
This commits adds file based service discovery which reads target
groups from specified files. It detects changes based on file watches
and regular refreshes.
 2015-05-15 14:44:54 +02:00