Julius Volz
3ef44a9c9e
Merge pull request #817 from prometheus/fix-consoles-link-to-prometheus-root
...
Fix consoles "Prometheus" link to point to /
2015-06-18 19:27:16 +02:00
Johannes 'fish' Ziemke
4d1711804a
Fix consoles "Prometheus" link to point to /
2015-06-18 19:25:19 +02:00
Julius Volz
b4dfbf89a8
Merge pull request #815 from prometheus/fabxc/fix-date
...
cmd/prometheus: fix version output
2015-06-18 13:54:57 +02:00
Fabian Reinartz
f97db8d4e5
cmd/prometheus: fix version output
2015-06-18 12:53:00 +02:00
Fabian Reinartz
459d18cf18
Merge pull request #812 from Marmelatze/consul_services
...
Use Consul ServiceAddress instead of Address when set
2015-06-17 20:10:52 +02:00
Florian Pfitzer
0ac7e7217e
Use Consul ServiceAddress instead of Address when set
2015-06-17 15:39:42 +02:00
Fabian Reinartz
2bf7e1ac98
Merge pull request #811 from prometheus/fabxc/version
...
Move version info to its own package and add version endpoint.
2015-06-17 14:58:39 +02:00
Fabian Reinartz
119801027f
web: expose a version information endpoint
2015-06-17 14:49:31 +02:00
Brian Brazil
a79cffcc44
Merge pull request #784 from brian-brazil/serverset
...
Add basic support for Zookeeper Serversets for SD
2015-06-17 10:54:16 +01:00
Fabian Reinartz
39edc2df7a
version: move version information into separate package.
...
Version information is determined at build-time and thus there is
no need to pass it down from main. In its own package it can
be used from various other packages.
2015-06-16 14:48:29 +02:00
Brian Brazil
4d895242f9
Add support for Zookeeper Serversets for SD.
...
It can discover an entire tree of serversets, or just one.
2015-06-16 11:02:08 +01:00
Julius Volz
95bd64c770
Merge pull request #806 from metcalfc/fix_609
...
Handle building without git.
2015-06-15 21:38:05 +02:00
Chad Metcalf
af52579189
Handle building without git.
...
Resolves #609 by removing two dependencies on git.
- Use the Makefile to find the current directory.
- In the case of building from an archive fall back to fixed REV
and BRANCH values.
2015-06-15 12:21:29 -07:00
Fabian Reinartz
330ed7b9f2
Merge pull request #809 from prometheus/update-make-format
...
Update file exclusion list for `make format`.
2015-06-15 21:04:28 +02:00
Fabian Reinartz
7b302f1a59
Merge pull request #808 from prometheus/fabxc/ref-main
...
refactor main, flag handling, and web package
2015-06-15 19:01:47 +02:00
Fabian Reinartz
31325c1fd0
make: adjust to new main location.
2015-06-15 19:01:06 +02:00
Fabian Reinartz
85d7c7640a
web: remove flags, refactor handlers
2015-06-15 19:01:06 +02:00
Fabian Reinartz
a0b3aaa551
notification: remove flags
2015-06-15 19:01:06 +02:00
Fabian Reinartz
b105e26f4d
storage: remove global flags
2015-06-15 19:01:06 +02:00
Fabian Reinartz
fe301d7946
promql: remove global flags
2015-06-15 19:01:06 +02:00
Fabian Reinartz
de66e32a4d
cmd/prometheus: create new main package.
2015-06-15 19:01:06 +02:00
Julius Volz
f10effceb1
Update file exclusion list for make format.
2015-06-15 16:31:35 +02:00
Brian Brazil
689ef7f678
Merge pull request #803 from prometheus/relabel-scrapes
...
Allow ingested metrics to be relabeled.
2015-06-15 12:05:31 +01:00
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
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
