mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-05 05:04:04 -08:00
Code Issues Actions 22 Packages Projects Releases Wiki Activity
5171 commits 263 branches 434 tags 663 MiB
Commit graph

5171 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 5da5ea3ee2 Merge pull request #804 from prometheus/blob-fmt 
Web: Format files.go when it is built.
 2015-06-13 17:39:25 +02:00
Brian Brazil 27ef54263e Web: Format files.go when it is built. 
This will avoid unrelated changes appearing
when you do a make fmt
 2015-06-13 15:27:08 +01:00
Brian Brazil 0dbae36d36 Allow ingested metrics to be relabeled. 
The main purpose of this is to allow for blacklisting
of expensive metrics as a tactical option.
It could also find uses for renaming and removing labels
from federation.
 2015-06-13 15:18:27 +01:00
Brian Brazil 58ceae82bc Revert "Allow ingested metrics to be relabeled." 
This reverts commit f2f26ca08f.

Was accidentally pushed to master instead of a branch for PR.
 2015-06-12 22:12:26 +01:00
Brian Brazil f2f26ca08f Allow ingested metrics to be relabeled. 
The main purpose of this is to allow for blacklisting
of expensive metrics as a tactical option.
It could also find uses for renaming and removing labels
from federation.
 2015-06-12 22:06:30 +01:00
Julius Volz 5e50addc87 Merge pull request #801 from sdurrheimer/master 
Fix Dockerfile with recent embed-static.sh/go-bindata change
 2015-06-12 18:22:49 +02:00
Steve Durrheimer f61ffb4fc0 Fix Dockerfile with recent embed-static.sh/go-bindata change 2015-06-12 18:19:25 +02:00
Julius Volz 3c6c80d179 Merge pull request #800 from prometheus/pad-data-range 
Always show selected range, regardless of returned data.
 2015-06-12 18:03:44 +02:00
Julius Volz b9b20fd80e Always show selected range, regardless of returned data. 2015-06-12 17:22:06 +02:00
Julius Volz 395a0b3b11 Merge pull request #799 from prometheus/multiline-expr-input 
Change expression input field to multi-line textarea.
 2015-06-12 17:03:54 +02:00
Julius Volz 8bb578c1fe Change expression input field to multi-line textarea. 
Also, rearrange and clean up some things to make this work.
The textarea starts as a single line, but auto-expands when entering
multiple lines (e.g. via Shift+Enter). Pressing just "Enter" still
executes the expression.
 2015-06-12 16:59:38 +02:00
Julius Volz 6247bd5a5a Merge pull request #798 from miekg/hup-signal-handing 
Start HUP signal handler earlier
 2015-06-12 15:46:43 +02:00
Miek Gieben 4b43e825f4 Rename block to hupReady 
Remove the write to the channel as per comments.
 2015-06-12 14:45:02 +01:00
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