RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-28 01:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,745 Commits 243 Branches 444 Tags 653 MiB
c60e3387ef
Commit Graph

1745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
beorn7
c36e0e05f1 Add crash recovery of fingerprint mappings. 2015-05-07 18:58:14 +02:00
beorn7
2235cec175 Handle fingerprint collisions. 2015-05-07 18:17:59 +02:00
Fabian Reinartz
5fbde88919 Switch config to YAML format. 2015-05-07 16:52:14 +02:00
Julius Volz
b404ad5c91 Merge pull request #678 from prometheus/remove-rules-target 
Remove obsolete "rules" target from main Makefile.
 2015-05-07 12:28:25 +02:00
Julius Volz
0dc8f3cb04 Remove obsolete "rules" target from main Makefile. 2015-05-07 11:59:06 +02:00
Julius Volz
2579606e77 Merge pull request #676 from prometheus/fabxc/promql 
Query/rules refactoring
 2015-05-07 11:39:26 +02:00
Fabian Reinartz
66ecc420ef Add gopkg.in/yaml.v2 godep. 2015-05-07 11:07:04 +02:00
Fabian Reinartz
1dd0b772cb Fix missing Godep entry. 2015-05-06 13:21:44 +02:00
Fabian Reinartz
eeca323d24 Merge branch 'master' into promql 2015-05-06 13:04:54 +02:00
Björn Rabenstein
498b85f05f Merge pull request #673 from prometheus/beorn7/fingerprint 
Use FastFingerprint where appropriate.
 2015-05-06 12:24:06 +02:00
beorn7
bb141fd3db Updated vendoring. 
This pulls in the required changes in client_golang.
 2015-05-06 12:14:05 +02:00
beorn7
9820e5fe99 Use FastFingerprint where appropriate. 2015-05-06 12:00:58 +02:00
Fabian Reinartz
b365947bc4 Merge pull request #666 from prometheus/fabxc/pql/gate 
Limit maximum number of concurrent queries.
 2015-05-06 11:36:33 +02:00
Fabian Reinartz
9ab1f6c690 Limit maximum number of concurrent queries. 
A high number of concurrent queries can slow each other down
so that none of them is reasonbly responsive. This commit limits
the number of queries being concurrently executed.
 2015-05-06 11:34:17 +02:00
Julius Volz
f4d90a105e Merge pull request #672 from prometheus/release-0.13.2 
Release 0.13.2
 2015-05-06 11:11:07 +02:00
Johannes 'fish' Ziemke
36023ed213 Cut 0.13.2 2015-05-06 11:08:58 +02:00
Julius Volz
874ff194c4 Merge pull request #671 from prometheus/add-rule-checker-to-archive 
Include tools/rule_checker/rule_checker in tarball
 2015-05-06 10:27:17 +02:00
Johannes 'fish' Ziemke
e020b91603 Merge pull request #669 from prometheus/fabxc/sd_warn 
Add warning about config changes.
 2015-05-05 19:10:36 +02:00
Johannes 'fish' Ziemke
ab3e08e070 Add rule_checker and console templates to archive 2015-05-05 18:40:51 +02:00
Fabian Reinartz
8f75ff0513 Add warning about config changes. 2015-05-05 15:17:55 +02:00
Fabian Reinartz
d59d1cb2c1 Fix Error() methods. 2015-05-01 17:58:58 +02:00
Julius Volz
d108366cd6 Merge pull request #662 from prometheus/fabxc/sd_cfg 
Cleanup, test, and document config.
 2015-04-30 23:58:10 +02:00
Fabian Reinartz
b8fa0a9f8d Merge pull request #665 from chkno/master 
Fix storage/local tests for 32-bit systems
 2015-04-30 23:54:09 +02:00
Scott Worley
e5f92d35fe Fix storage/local tests for 32-bit systems 2015-04-30 14:19:48 -07:00
Julius Volz
44d2f7c9ba Merge pull request #664 from fabxc/gitignore 
Add *.rules to ignored files.
 2015-04-30 21:50:17 +02:00
Fabian Reinartz
049b8eaafb Add *.rules to ignored files. 2015-04-30 21:40:27 +02:00
Fabian Reinartz
b5a8f7b8fa Cleanup, test, and document config. 2015-04-30 21:17:19 +02:00
Fabian Reinartz
cb35b7d0e7 Merge pull request #657 from prometheus/fabxc/sd_relabel 
Add relabelling to target management.
 2015-04-30 19:43:15 +02:00
Fabian Reinartz
945c49a2dd Add relabelling to target management. 
This commit adds a relabelling stage on the set of base
labels from which a target is created. It allows to drop
targets and rewrite any regular or internal label.
 2015-04-30 18:46:33 +02:00
Fabian Reinartz
6649306e63 Merge pull request #660 from prometheus/fabxc/pql/parse-errs 
Fix and improve parsing error output.
 2015-04-30 13:31:13 +02:00
Fabian Reinartz
279831cdf1 Fix and improve parsing error output. 2015-04-30 12:19:39 +02:00
Julius Volz
adba3b4daa Merge pull request #661 from prometheus/fabxc/pql/rule-stmts 
Stop routing rule statements through the engine.
 2015-04-29 22:55:53 +02:00
Fabian Reinartz
fe935179cd Stop routing rule statements through the engine. 2015-04-29 18:01:43 +02:00
Fabian Reinartz
8d7c479fed Merge pull request #658 from prometheus/fabxc/pql/rules-manager 
Rename RuleManager to Manager, remove interface.
 2015-04-29 16:54:21 +02:00
Fabian Reinartz
43e291e978 Merge pull request #659 from prometheus/fabxc/pql/parse-err 
Remove `name` arg from `Parse*` functions, enhance parsing errors.
 2015-04-29 16:50:15 +02:00
Fabian Reinartz
479891c9be Rename RuleManager to Manager, remove interface. 
This commits renames the RuleManager to Manager as the package
name is 'rules' now. The unused layer of abstraction of the
RuleManager interface is removed.
 2015-04-29 16:42:10 +02:00
Fabian Reinartz
25cdff3527 Remove name arg from Parse* functions, enhance parsing errors. 2015-04-29 16:38:41 +02:00
Fabian Reinartz
e668b361bc Merge pull request #654 from prometheus/fabxc/sd_cfg 
Change JobConfig to ScrapeConfig.
 2015-04-29 00:02:50 +02:00
Fabian Reinartz
0b619b46d6 Change JobConfig to ScrapeConfig. 
This commit changes the configuration interface from job configs to scrape
configs. This includes allowing multiple ways of target definition at once
and moving DNS SD to its own config message. DNS SD can now contain multiple
DNS names per configured discovery.
 2015-04-28 23:18:55 +02:00
Fabian Reinartz
95fbe51c50 Merge pull request #655 from prometheus/fabxc/promql_3 
Switch Prometheus to promql package.
 2015-04-28 17:56:49 +02:00
Fabian Reinartz
3ca11bcaf5 Switch Prometheus to promql package. 
This commit removes all functionality from rules/ that is now handled in
promql/.
All parts of Prometheus are changed to use the promql/ package.
 2015-04-28 16:19:23 +02:00
Fabian Reinartz
555b630b52 Merge pull request #650 from prometheus/fabxc/promql_2 
Refactor query evaluation.
 2015-04-28 14:23:19 +02:00
Fabian Reinartz
5602328c7c Refactor query evaluation. 
This copies the evaluation logic from the current rules/ package.
The new engine handles the execution process from query string to final result.
It provides query timeout and cancellation and general flexibility for
future changes.

functions.go: Add evaluation implementation. Slight changes to in/out data but
	not to the processing logic.
quantile.go: No changes.
analyzer.go: No changes.
engine.go: Actually new part. Mainly consists of evaluation methods
	which were not changed.
setup_test.go: Copy of rules/helpers_test.go to setup test storage.
promql_test.go: Copy of rules/rules_test.go.
 2015-04-28 14:19:05 +02:00
Julius Volz
dad766e794 Merge pull request #645 from fabxc/fabxc/sd 
Make target manager source based.
 2015-04-27 18:30:33 +02:00
Johannes 'fish' Ziemke
fb3b464f7d Write rule_checker to /bin/rule_checker 2015-04-24 17:29:42 +02:00
Johannes 'fish' Ziemke
166f492a0e Remove /etc/prometheus from volume definition 2015-04-24 16:12:31 +02:00
Johannes 'fish' Ziemke
2bb3efc69d Merge pull request #649 from sdurrheimer/master 
Small size docker image refactoring
 2015-04-24 16:07:03 +02:00
Fabian Reinartz
5015c2a0e8 Make target manager source based. 
This commit shifts responsibility for maintaining targets from providers and
pools to the target manager. Target groups have a source name that identifies
them for updates.
 2015-04-24 15:49:35 +02:00
Steve Durrheimer
af99960974 Small size docker image refactoring 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-04-23 21:56:01 +02:00
Fabian Reinartz
089f019660 Merge pull request #639 from fabxc/fabxc/promql_1 
Create promql package with lexer/parser.
 2015-04-23 16:10:56 +02:00