RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-29 02:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,096 Commits 243 Branches 0 Tags 653 MiB
ac0be60bb9
Commit Graph

2096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Björn Rabenstein
aea906123d Merge pull request #879 from prometheus/beorn7/makefile 
Fix the race condition targets in the Makefile.
 2015-07-07 00:18:26 +02:00
beorn7
b55a71a30c Fix the race condition targets in the Makefile. 
Remove race_condition_run as the original run target has been removed, too.

Fix the race_condition_binary target.
 2015-07-06 22:26:41 +02:00
Fabian Reinartz
86474f3b0e Merge pull request #876 from prometheus/fabxc/authhide 
config: hide authentication credentials in String() output
 2015-07-06 18:35:14 +02:00
Fabian Reinartz
02e06839f2 config: hide authentication credentials in String() output 2015-07-06 14:28:07 +02:00
Fabian Reinartz
f515559a96 Merge pull request #872 from prometheus/fabxc/vecfix 
promql: marshal sample pairs to JSON tuples.
 2015-07-06 13:46:10 +02:00
Fabian Reinartz
75ba840d88 web/js: adjust Javascript to new response format 2015-07-06 13:09:26 +02:00
Fabian Reinartz
3d67d75935 promql: implement JSON array format for scalar and string 2015-07-06 13:09:26 +02:00
Fabian Reinartz
834cec44cf httputil: remove non-general helper functions 2015-07-06 10:30:00 +02:00
Fabian Reinartz
77e8983221 promql: add MarshalJSON method for SamplePair 2015-07-06 10:29:59 +02:00
Fabian Reinartz
92c20168c4 Merge pull request #874 from prometheus/fabxc/cfgfix 
resolve rule files relative to config file.
 2015-07-03 16:15:16 +02:00
Julius Volz
d4f1402444 Merge pull request #873 from prometheus/global-url-tests 
Add tests for "globalURL" template function.
 2015-07-03 15:24:05 +02:00
Fabian Reinartz
7e615dcdf0 cmd/promtool: resolve rule files relative to config file 2015-07-03 15:10:37 +02:00
Fabian Reinartz
feb8a03503 rules: load rule files relative to a base dir 2015-07-03 15:10:37 +02:00
Julius Volz
0f57b403a9 Add tests for "globalURL" template function. 2015-07-03 14:47:52 +02:00
Julius Volz
fd7b4cae43 Merge pull request #864 from prometheus/configurable-scheme 
Consolidate external reachability flags into one.
 2015-07-03 14:39:39 +02:00
Julius Volz
fcff35b43e Consolidate external reachability flags into one. 
Besides fixing https://github.com/prometheus/prometheus/issues/805 by
making the entire externally reachable server URL configurable, this
adds tests for the "globalURL" template function and makes it easier to
test other such functions in the future.

This breaks the `web.Hostname` flag (and introduces `web.external-url`).
This flag is likely only used by few users, so I hope that's
justifiable.

Fixes https://github.com/prometheus/prometheus/issues/805
 2015-07-03 13:39:10 +02:00
Fabian Reinartz
85100767f7 Merge pull request #870 from prometheus/fabxc/ctype 
api/v1: fix response format tests
 2015-07-02 14:21:35 +02:00
Fabian Reinartz
8f904d6a54 api/v1: fix response format tests 2015-07-02 14:12:26 +02:00
Julius Volz
78f4da8bf1 Merge pull request #859 from sdurrheimer/circleci 
Add circleci yaml for Dockerfile test build
 2015-07-02 14:06:07 +02:00
Fabian Reinartz
6b3d79cfce Merge pull request #868 from prometheus/fabxc/ctype 
api/v1: fix Content-Type in response
 2015-07-01 22:49:32 +02:00
Fabian Reinartz
b36fa7ad61 api/v1: fix Content-Type in response 2015-07-01 22:47:25 +02:00
Brian Brazil
293f3808fb Merge pull request #866 from brian-brazil/zk-no-node 
retrieval: Handle serverset node not existing.
 2015-07-01 14:06:23 +01:00
Brian Brazil
3d268d681e retrieval: Handle serverset node not existing. 
This stops configuration loading hanging if
the Znode doesn't exist, and retries until the
node does exist.
 2015-07-01 13:56:31 +01:00
Fabian Reinartz
049a106821 Merge pull request #863 from prometheus/fabxc/alertstate 
Preserve alert state, cleanup rules/
 2015-06-30 18:53:07 +02:00
Fabian Reinartz
f06cf664e1 rules: cleanup alerting test 2015-06-30 18:22:24 +02:00
Fabian Reinartz
9bd4f6d017 rules: preserve alert state across reloads. 2015-06-30 11:32:07 +02:00
Fabian Reinartz
4625485b84 rules: move rules*.go contents to manager*.go 2015-06-30 11:32:07 +02:00
Steve Durrheimer
016e00441f Add circleci yaml for Dockerfile test build 2015-06-26 11:00:15 +02:00
Fabian Reinartz
1e61b5e0cf Merge pull request #858 from prometheus/fabxc/rmtfix 
cmd/prometheus: fix remote storage fanout
 2015-06-26 01:49:38 +02:00
Fabian Reinartz
b201725d1c cmd/prometheus: fix remote storage fanout 2015-06-26 01:34:51 +02:00
Julius Volz
edc73318eb Merge pull request #857 from prometheus/container-builds 
Enable container-based Travis builds.
 2015-06-26 00:16:09 +02:00
Julius Volz
fed2fcbe25 Enable container-based Travis builds. 
See:

http://docs.travis-ci.com/user/workers/container-based-infrastructure/

Apparently disabling sudo is all that's needed.
 2015-06-26 00:14:13 +02:00
Fabian Reinartz
ab7473b970 Merge pull request #856 from sdurrheimer/fix-dockerfile 
Fix Dockerfile with the removal of tools/rulechecker
 2015-06-25 21:13:18 +02:00
Steve Durrheimer
785736c742 Fix Dockerfile with the removal of tools/rulechecker 2015-06-25 20:59:55 +02:00
Julius Volz
5176a480e6 Merge pull request #855 from prometheus/cut-0.15.0 
Cut Prometheus 0.15.0rc1.
 2015-06-25 19:22:32 +02:00
Julius Volz
9ad71e5bbe Cut Prometheus 0.15.0rc1. 2015-06-25 19:14:42 +02:00
Julius Volz
21aec6e437 Merge pull request #854 from prometheus/fabxc/rulecheckerkill0r 
tools/rulechecker: bye bye
 2015-06-25 19:13:59 +02:00
Fabian Reinartz
6e61fd3e96 tools/rulechecker: bye bye 2015-06-25 19:11:49 +02:00
Julius Volz
8887f1e1a2 Merge pull request #853 from prometheus/fabxc/help 
cmd/prometheus: improve help output
 2015-06-25 18:59:01 +02:00
Fabian Reinartz
525070419b cmd/prometheus: improve help output 2015-06-25 18:53:51 +02:00
Julius Volz
e701bdc434 Merge pull request #852 from prometheus/fabxc/graph 
web: generate embedded assets.
 2015-06-25 18:05:32 +02:00
Fabian Reinartz
22945455ac Merge pull request #851 from prometheus/fabxc/promtool 
cmd/promtool: fix missing builddate in version info
 2015-06-25 17:27:19 +02:00
Fabian Reinartz
4db3eeb054 web: generate embedded assets. 2015-06-25 17:26:26 +02:00
Fabian Reinartz
080e067601 Merge pull request #832 from prometheus/fabxc/target-test 
retrieval: double timeout in target scrape test.
 2015-06-25 17:23:52 +02:00
Fabian Reinartz
bcc8101d9e cmd/promtool: fix missing builddate in version info 2015-06-25 17:21:24 +02:00
Julius Volz
a8f117b02d Merge pull request #849 from prometheus/use-api-v1 
Use v1 API for querying.
 2015-06-25 15:14:01 +02:00
Julius Volz
cf2a7a7ca9 Use v1 API for querying. 
Also remove hidden input fields that are not used anymore, because the
query params are now passed as JSON to the AJAX function. This also has
the wonderful side effect that we're no longer sending all the other
non-hidden fields along to the query endpoints anymore.
 2015-06-25 15:05:04 +02:00
Fabian Reinartz
c1d37bc55b Merge pull request #843 from prometheus/fabxc/runbook 
promql: add runbook to alert statement.
 2015-06-25 14:07:45 +02:00
Julius Volz
ef4ba843a2 Merge pull request #848 from prometheus/fabxc/apifix 
promql: add json tags, fix query constructor.
 2015-06-25 13:46:09 +02:00
Fabian Reinartz
70d7a987a7 promql: add json tags, fix query constructor. 2015-06-25 13:44:05 +02:00