Commit Graph

1754 Commits

Author SHA1 Message Date
Fabian Reinartz
e88e5f680b web: simplify prefix handling using util/route package. 2015-06-03 15:53:04 +02:00
Fabian Reinartz
6c24114a7b util/route: create route package.
The route package is a thin wrapper around github.com/julienschmidt/httprouter.
It brings the interface back to http.Handler and embedds params in a context.
The new router comes with prefixing support.
2015-06-03 08:49:43 +02:00
Fabian Reinartz
1024900218 Godeps: add github.com/julienschmidt/httprouter 2015-06-03 08:45:43 +02:00
Fabian Reinartz
78047326b4 web: cleanup initialization of web service. 2015-06-03 08:45:43 +02:00
Fabian Reinartz
3247052563 Merge pull request #768 from fabxc/fabxc/rule-err
main: exit on invalid rule files on startup.
2015-06-02 20:31:35 +02:00
Fabian Reinartz
4e65fdedfb Merge pull request #765 from prometheus/fabxc/cfg-tags
config: fix json/yaml tag inconsistencies.
2015-06-02 20:19:36 +02:00
Fabian Reinartz
bc574a0d93 Merge pull request #767 from prometheus/fabxc/cr-fix
promql: fix lexing of \r as whitespaces
2015-06-02 20:19:20 +02:00
Fabian Reinartz
280d11dca8 main: exit on invalid rule files on startup. 2015-06-02 18:44:41 +02:00
Fabian Reinartz
c60e3387ef promql: fix lexing of \r as whitespaces 2015-06-02 18:33:49 +02:00
Fabian Reinartz
17c4c8ed95 config: fix json/yaml tag inconsistencies. 2015-06-02 18:21:19 +02:00
Fabian Reinartz
867f2ac979 Merge pull request #762 from prometheus/0.14.1
0.14.1
2015-06-02 13:24:12 +02:00
Fabian Reinartz
93de548320 Merge pull request #763 from joonas/joonas/fix_scrape_interval_default
Restore default ScrapeInterval of 1 minute instead of 10 seconds
2015-06-02 10:00:14 +02:00
Joonas Bergius
5d5c3878ed Restore default ScrapeInterval of 1 minute instead of 10 seconds 2015-06-01 22:41:33 -04:00
Fabian Reinartz
5c6c0e2faa Add storage method to delete time series 2015-06-01 21:23:32 +02:00
Fabian Reinartz
0de6edbdfc Move pkg/ to util/ 2015-06-01 21:12:32 +02:00
Fabian Reinartz
027d8968d5 Move embed-static.sh into scripts folder 2015-06-01 21:12:32 +02:00
Fabian Reinartz
02717e6fde Remove generic set type 2015-06-01 21:12:32 +02:00
Fabian Reinartz
dbc0d30e3e Move string functionality to pkg/strutil 2015-06-01 21:12:32 +02:00
Fabian Reinartz
f45a5cab60 Move templates package to pkg/template 2015-06-01 21:12:31 +02:00
Fabian Reinartz
ccf51b132e Move stats package to pkg/stats 2015-06-01 21:12:31 +02:00
Fabian Reinartz
dfaf31a1da Move web/httputils to pkg/httputil and add DeadlineClient to it 2015-06-01 21:12:31 +02:00
Fabian Reinartz
2317b001d0 Move flock package to pkg/flock 2015-06-01 21:12:31 +02:00
Fabian Reinartz
3c8fbf1e15 Move test package to pkg/testutil 2015-06-01 21:12:31 +02:00
Fabian Reinartz
c44ac7bc26 Load rule files from entire directories 2015-06-01 21:12:31 +02:00
Fabian Reinartz
ed6572fc0c Fix typos 2015-06-01 21:12:31 +02:00
Fabian Reinartz
67e77411ba Merge pull request #761 from prometheus/fabxc/vendor
Update client_golang dependency to 0.6.0
2015-06-01 20:31:45 +02:00
Fabian Reinartz
31c9c5d324 Update client_golang dependency to 0.6.0 2015-06-01 19:28:17 +02:00
Fabian Reinartz
d96a007e7f Merge pull request #759 from prometheus/fabxc/cut
Cut 0.14.0.
2015-06-01 18:44:32 +02:00
Fabian Reinartz
6dde527ee0 Cut 0.14.0. 2015-06-01 18:44:21 +02:00
Fabian Reinartz
b8b9a6a472 Merge pull request #760 from prometheus/config-change-notice
Add links to configuration change notice.
2015-06-01 18:38:25 +02:00
Julius Volz
cf64bbe1ce Add links to configuration change notice. 2015-06-01 18:36:11 +02:00
Brian Brazil
cf65f2df0a Merge pull request #751 from prometheus/alert-json-case
Change case of alert json to initial lower letter.
2015-06-01 14:13:53 +01:00
Julius Volz
b0a1ca02f1 Merge pull request #755 from prometheus/noslash-pathprefix
Fix slash position in MustBuildServerURL().
2015-06-01 13:38:28 +02:00
Julius Volz
5e12eab0da Merge pull request #756 from StephanErb/prometheus.yml
Fix reference to example configuration file
2015-06-01 13:12:55 +02:00
Stephan Erb
c4b84d328a Fix reference to example configuration file 2015-06-01 13:05:48 +02:00
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