RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-26 08:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,958 Commits 243 Branches 444 Tags 653 MiB
1c25247a75
Commit Graph

1958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miek Gieben
d8651302fc Start HUP signal handler earlier 
When prometheus starts up and is recovering its state it will not handle
SIGHUPs. If it receives those during this phase it will exit. The change
here makes prometheus ignore SIGHUPs until it is ready to handle them.

Note this is only done for SIGHUP because that signal is used for
trigger a config reload and a such something could already be sending
these signals as part of a config update.
 2015-06-12 14:30:14 +01:00
Fabian Reinartz
3ec2e2323d Merge pull request #793 from prometheus/fabxc/make 
make: do not call go-bindata on building.
 2015-06-12 15:21:55 +02:00
Julius Volz
1e59167d48 Merge pull request #797 from prometheus/keep-common 
Deprecate `keeping_extra`, rename it to `keep_common`.
 2015-06-12 15:11:10 +02:00
Fabian Reinartz
9013319d3a Merge pull request #796 from prometheus/fabxc/cfg-err 
config: raise error on unknown config parameters
 2015-06-12 14:59:13 +02:00
Julius Volz
5e2d1c1464 Deprecate keeping_extra, rename it to keep_common. 
`keep_common` is more in line with the function name
`drop_common_labels()` terminology-wise, and also more in line with
`group_left`/`group_right` (no `...ing` verb suffix).

We could also go the full way and call it `keep_common_labels`. That
would have the benefit of being even more consistent with the function
`drop_common_labels()` and would be more explanatory, but it also seems
quite long.
 2015-06-12 14:21:05 +02:00
Julius Volz
0542733964 Merge pull request #795 from prometheus/fabxc/promql-print 
Fix print bug, remove DotGraph methods
 2015-06-12 14:05:05 +02:00
Fabian Reinartz
116e6df096 config: raise error on unknown config parameters. 
The YAML parser ignores additional parameters on unmarshaling. This causes
frequent confusion with bad configs that pass parsing.
These changes raise errors on additional parameters.
 2015-06-12 13:42:56 +02:00
Fabian Reinartz
3a24a7779d config: extend and format config example/test. 2015-06-12 13:39:12 +02:00
Fabian Reinartz
e7659f908c promql: remove DotGraph methods from nodes. 2015-06-12 09:48:14 +02:00
Fabian Reinartz
c716d8a47b promql: fix aggregation expression String() method. 
Fixes #794.
 2015-06-12 09:48:01 +02:00
Fabian Reinartz
8d304d95e5 make: do not call go-bindata on building. 2015-06-12 09:29:37 +02:00
Fabian Reinartz
6bb5e3f8cd Merge pull request #792 from prometheus/fabxc/range-fix 
promql: fix missing metric in range results.
 2015-06-11 23:59:51 +02:00
Fabian Reinartz
c32ae22119 promql: fix missing metric in range results. 2015-06-11 23:50:53 +02:00
Julius Volz
ae2bff45ea Merge pull request #790 from prometheus/ignore-data-dir 
Add "data" directory to .gitignore.
 2015-06-11 15:44:00 +02:00
Julius Volz
bd47e159d9 Add "data" directory to .gitignore. 2015-06-11 15:39:28 +02:00
Julius Volz
723e070867 Merge pull request #789 from prometheus/change-storage-path-default 
Place storage under working directory by default.
 2015-06-11 15:33:57 +02:00
Julius Volz
39aa66e46e Place storage under working directory by default. 2015-06-11 15:31:50 +02:00
Fabian Reinartz
bc09484608 Merge pull request #788 from prometheus/fabxc/cfg-re 
config: error on missing regex in relabel config.
 2015-06-11 14:49:39 +02:00
Fabian Reinartz
70e0be6295 Merge pull request #783 from prometheus/fabxc/api-v1-ext 
/series endpoints for API v1 and scalar range queries
 2015-06-11 14:06:04 +02:00
Julius Volz
92a0af37e4 Merge pull request #782 from smyrman/master 
Make Prometheus build on Windows (without make).
 2015-06-11 13:04:47 +02:00
Fabian Reinartz
7bb7e565a4 web/api: add GET and DELETE /series endpoints 2015-06-11 12:24:57 +02:00
Fabian Reinartz
0acd44b0e3 promql: expose ParseMetric and ParseMetricSelector 2015-06-11 12:22:11 +02:00
Fabian Reinartz
458550560c config: error on missing regex in relabel config. 
Fixes issue #787.
 2015-06-10 23:42:51 +02:00
Sindre Myren
a081c9436b Building without a Makefile (on Windows) 
Main changes:

- Switched to using `go-bindata` in place of `scripts/embed-static.sh`.
- Support for building Prometheus without a `Makefile`.
- Minor typo fix to make Prometheus build on Windows (without Makefiles).

Please note that this does not mean that prometheus will work on Windows.
There are still failing tests!
 2015-06-10 20:43:59 +02:00
Fabian Reinartz
7be94ce962 web/api: improve errors, add tests 2015-06-10 18:36:02 +02:00
Fabian Reinartz
cb10ceac18 promql: allow scalar expressions in range queries, improve errors. 
These changes allow to do range queries over scalar expressions.
Errors on bad types for range queries are now raised on query creation
rather than evaluation.
 2015-06-10 18:36:02 +02:00
Fabian Reinartz
db4df06414 Merge pull request #781 from prometheus/fabxc/api-v1-ext 
Replace /metrics/names with /label/:name/values endpoint.
 2015-06-08 23:13:49 +02:00
Fabian Reinartz
75b0b7420e web/api: replace /metrics/names with /label/:name/values endpoint. 2015-06-08 23:10:52 +02:00
Fabian Reinartz
535c002f79 util/route: add WithParam function. 2015-06-08 21:38:49 +02:00
Fabian Reinartz
ae01a5366d Merge pull request #774 from prometheus/fabxc/api-v1 
Initial API v1 implementation
 2015-06-08 19:14:25 +02:00
Fabian Reinartz
5b713911e3 web/api: enable running API legacy and v1 in parallel 2015-06-08 19:11:48 +02:00
Julius Volz
8d8de7adbc Merge pull request #780 from prometheus/improve-target-label-ui 
Improve display of target labels on status page.
 2015-06-08 16:23:54 +02:00
Fabian Reinartz
b5fe2e9afe Merge pull request #773 from prometheus/fabxc/simple-cfg 
config: simplify default config handling.
 2015-06-08 16:22:06 +02:00
Julius Volz
adf6850853 Improve display of target labels on status page. 
Instead of a "{...}"-style list, show key/value pairs as Bootstrap
labels.
 2015-06-08 16:12:58 +02:00
Fabian Reinartz
f6c33a2347 config: prevent overwrite of DefaultGlobalConfig 2015-06-08 16:02:10 +02:00
Julius Volz
51653e7890 Merge pull request #779 from prometheus/fabxc/rule-cleanup 
rule cleanup
 2015-06-08 15:12:47 +02:00
Brian Brazil
1047fcfc6e Merge pull request #776 from prometheus/relabel-debug 
Web: Add pre-relabel labels to status page.
 2015-06-08 12:24:16 +01:00
Brian Brazil
b8b1d3cbac Web: Add pre-relabel labels to status page. 
Figuring out what's going on with the new service discovery
and labels is difficult. Add a popover with the labels
to the target table to make things simpler, and help
discovery of potentially useful labels.
 2015-06-08 12:19:01 +01:00
Fabian Reinartz
ea8099a1d2 Merge pull request #778 from prometheus/fabxc/lname-re 
config: ensure correct labelname in JSON target group.
 2015-06-08 11:59:25 +02:00
Fabian Reinartz
ab9c98acac web/api: add initial API v1 implementation. 2015-06-06 21:47:36 +02:00
Fabian Reinartz
5e13880201 General cleanup of rules. 2015-06-06 21:40:52 +02:00
Fabian Reinartz
75c920c95e Remove DotGraph method from Rule interface 2015-06-06 21:35:59 +02:00
Fabian Reinartz
83d07516e8 Remove EvalRaw methods from Rule interface 2015-06-06 21:34:09 +02:00
Fabian Reinartz
db3367e83f config: ensure correct labelname in JSON target group. 2015-06-06 10:08:42 +02:00
Fabian Reinartz
0af1cff8af config: simplify default config handling. 2015-06-06 09:04:04 +02:00
Fabian Reinartz
b5f571fb6e Merge pull request #775 from prometheus/fabxc/tag-sep 
retrieval/discovery: surround __meta_consul_tags value with tag seperators.
 2015-06-05 19:19:29 +02:00
Fabian Reinartz
8214b4ee78 retrieval/discovery: surround __meta_consul_tags value with tag seperators. 2015-06-05 19:18:34 +02:00
Fabian Reinartz
7943aa834c Merge pull request #772 from prometheus/fabxc/dur-panic 
util/strutil: do not panic on wrong duration unit.
 2015-06-05 12:42:30 +02:00
Fabian Reinartz
03b737322e promql: expose storage and query engine for tests 2015-06-04 19:00:22 +02:00
Fabian Reinartz
319068a7a6 promql: fix parsing ambiguity for serial repetitions 2015-06-04 19:00:22 +02:00