Julius Volz
09fcf505f5
Fix slash position in MustBuildServerURL().
2015-06-01 12:54:19 +02:00
Julius Volz
a10c083446
Merge pull request #754 from prometheus/noslash-pathprefix
...
Convert pathPrefix to not have trailing slash.
2015-06-01 12:44:04 +02:00
Julius Volz
d7c015c149
Convert pathPrefix to not have trailing slash.
2015-06-01 12:43:17 +02:00
Brian Brazil
75e8b48c87
Change case of alert json to initial lower letter.
...
This is more in line with common practice,
and with the webhook in alertmanager this will
be more directly exposed to users.
2015-05-30 14:35:51 +01:00
Julius Volz
d7b471f3cc
Merge pull request #748 from prometheus/fabxc/cut
...
Cut 0.14.0rc3
2015-05-29 14:46:08 +02:00
Fabian Reinartz
507e10c929
Cut 0.14.0rc3
2015-05-29 14:37:33 +02:00
Fabian Reinartz
a4f179230a
Merge pull request #744 from prometheus/fabxc/fix-labels
...
Fix discarding of labels in file target groups
2015-05-27 19:57:15 +02:00
Fabian Reinartz
e9b344abee
Fix discarding of labels in file target groups
2015-05-27 18:52:44 +02:00
Fabian Reinartz
8fdea33c30
Merge pull request #739 from prometheus/fabxc/reload-hangup
...
Stop holding TargetManager lock when stopping components.
2015-05-27 18:43:54 +02:00
Fabian Reinartz
078efa6e6a
Merge pull request #738 from prometheus/fabxc/retention-cutoff
...
Limit retrievable samples to retention window.
2015-05-27 13:26:48 +02:00
Fabian Reinartz
aff01e29c3
Limit retrievable samples to retention window.
...
The storage does not delete data immediately after the retention period.
We don't want to retrieve this data as it causes artifacts.
2015-05-27 13:13:59 +02:00
Fabian Reinartz
8b7e5f9184
Stop holding TargetManager lock when stopping components.
...
TargetProviders may flush some last changes to the target manager
before actually stopping. To properly read those form the channel
the target manager must not be locked while stopping a provider.
2015-05-27 12:41:37 +02:00
Fabian Reinartz
550ed0ea09
Merge pull request #732 from prometheus/area
...
Add increase() function, to replace delta(..., 1).
2015-05-27 01:20:44 +02:00
Brian Brazil
f34de493d5
Add increase() function, to replace delta(..., 1).
...
This calculates how much a counter increases over
a given period of time, which is the area under the curve
of it's rate.
increase(x[5m]) is equivilent to rate(x[5m]) * 300.
2015-05-26 22:49:21 +01:00
Julius Volz
7b5304850d
Merge pull request #737 from prometheus/change-function
...
Implement changes() function.
2015-05-26 19:59:51 +02:00
Julius Volz
d44a89c6e8
Implement changes() function.
...
changes() takes a range vector and returns the number of times a value
has changed in the given time window for each time series as an instant
vector.
2015-05-26 19:06:22 +02:00
Julius Volz
c00334d560
Merge pull request #736 from prometheus/counter-reset
...
Add resets() function to count counter resets.
2015-05-26 17:59:49 +02:00
Julius Volz
6f33ed9e59
Add resets() function to count counter resets.
...
resets() returns for every range vector element how many counter
resets there have been in the specified range.
2015-05-26 17:56:52 +02:00
Fabian Reinartz
f45aed7bea
Merge pull request #731 from prometheus/fabxc/cut-rc2
...
Cut v0.14.0rc2
2015-05-23 22:41:49 +02:00
Fabian Reinartz
0edf4ec072
Cut v0.14.0rc2
2015-05-23 22:33:38 +02:00
Julius Volz
97c0c01b40
Merge pull request #729 from prometheus/fix-double-slash
...
Fix double slash in GeneratorURL sent to alertmanager.
2015-05-23 22:25:43 +02:00
Fabian Reinartz
87f0932e97
Merge pull request #730 from prometheus/fabxc/file-sd-test
...
Fix file SD test
2015-05-23 22:18:30 +02:00
Fabian Reinartz
4fa96f9e82
Merge pull request #728 from prometheus/fabxc/testlog
...
Remove logging output from test runs
2015-05-23 21:31:42 +02:00
Fabian Reinartz
8eda04fbf1
Remove logging output from test runs
2015-05-23 21:21:56 +02:00
Fabian Reinartz
efb39cfd4e
Fix file SD test
2015-05-23 21:20:39 +02:00
Julius Volz
ff53d10849
Fix double slash in GeneratorURL sent to alertmanager.
...
Fixes https://github.com/prometheus/prometheus/issues/722
2015-05-23 19:16:57 +02:00
Fabian Reinartz
a92134a947
Merge pull request #724 from prometheus/fabxc/storage-startup
...
Read from indexing queue during crash recovery.
2015-05-23 16:50:47 +02:00
Julius Volz
837ffcea29
Merge pull request #726 from prometheus/improve-redirections
...
Improve web redirection and 404 behavior.
2015-05-23 16:16:26 +02:00
Fabian Reinartz
6e319532cf
Read from indexing queue during crash recovery.
...
Change #704 introduced a regression that started reading the queue only
after potential crash recovery. When more than the queue capacity was
indexed, Prometheus deadlocked.
2015-05-23 15:32:35 +02:00
Björn Rabenstein
c86f5fdfd1
Merge pull request #727 from prometheus/beorn7/fingerprint
...
Use an RW lock to checkpoint fingerprint mappings.
2015-05-23 14:39:03 +02:00
beorn7
dbcb3d9333
Use an RW lock to checkpoint fingerprint mappings.
...
This has to be backported to 0.13.x.
2015-05-23 14:05:05 +02:00
Julius Volz
acd2df7507
Merge pull request #725 from prometheus/fabxc/testflags
...
Remove test flags in help output
2015-05-23 13:15:46 +02:00
Julius Volz
bab1ae3a48
Merge pull request #717 from gesellix/add-hostname-flag
...
allow to override the default os.Hostname() when creating PrometheusURLs
2015-05-23 13:05:58 +02:00
Tobias Gesellchen
84d42f48e5
allow to override the default os.Hostname() when creating PrometheusURLs
2015-05-23 12:59:38 +02:00
Julius Volz
fcd33bbfd8
Improve web redirection and 404 behavior.
...
Previously we redirected any non-existent path to the root (or path
prefix).
The new behavior:
With no path prefix:
- "" -> "/"
- "/biz" -> 404
With path prefix of "/foo/bar":
- "" -> "/foo/bar/"
- "/" -> "/foo/bar/"
- "/foo/bar" -> "/foo/bar/"
- "/biz" -> /foo/bar/biz"
(anything not starting with the path prefix gets the prefix prepended)
- "/foo/bar/biz" -> 404
2015-05-23 12:46:16 +02:00
Fabian Reinartz
b7eb105ffa
Remove test flags in help output
2015-05-23 12:23:33 +02:00
Fabian Reinartz
db2a0e17c5
Merge pull request #723 from prometheus/fabxc/gitign
...
Ignore YAML files
2015-05-23 11:42:20 +02:00
Fabian Reinartz
b29b4f1ee9
Ignore YAML files
2015-05-23 11:20:14 +02:00
Julius Volz
52ef225b83
Merge pull request #720 from prometheus/update-docker-file-yml-change
...
Rename refs to prometheus.conf -> prometheus.yml and remove logtostderr flag
2015-05-22 18:09:17 +02:00
Johannes 'fish' Ziemke
6a2983c615
Rename refs to prometheus.conf -> prometheus.yml
2015-05-22 15:25:18 +00:00
Fabian Reinartz
25ce5f8667
Merge pull request #719 from prometheus/update-vendoring
...
Update all vendored dependency to latest versions.
2015-05-22 14:10:24 +02:00
Björn Rabenstein
52c401a4a3
Merge pull request #718 from prometheus/beorn7/doc
...
Update README.md.
2015-05-22 13:49:12 +02:00
Julius Volz
a7229565e6
Update all vendored dependency to latest versions.
2015-05-22 13:45:14 +02:00
beorn7
d989415c42
Update README.md.
2015-05-22 13:43:20 +02:00
Fabian Reinartz
9268bf9d36
Merge pull request #715 from prometheus/fabxc/0.14.0-rc1
...
Cut 0.14.0-rc1
2015-05-21 21:54:06 +02:00
Fabian Reinartz
1b96163b4e
Cut 0.14.0rc1
2015-05-21 21:43:27 +02:00
Julius Volz
388a08bd5e
Merge pull request #714 from prometheus/beorn7/instrumentation
...
Add metrics to count inconsistencies and fp collisions.
2015-05-21 18:48:38 +02:00
beorn7
3b9ab546e6
Add metrics to count inconsistencies and fp collisions.
2015-05-21 18:46:20 +02:00
Björn Rabenstein
c44e7cd105
Merge pull request #706 from prometheus/beorn7/persistence2
...
Improve iterator performance.
2015-05-21 13:48:52 +02:00
Julius Volz
a19e6b39d0
Merge pull request #713 from prometheus/fabxc/atomic_align
...
Align int64s for atomic operations
2015-05-21 11:52:42 +02:00