mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-27 06:29:42 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
1916 commits 243 branches 444 tags 649 MiB
Commit graph

1916 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Fabian Reinartz 749ae450c5 promql: add runbook to alert statement. 
This commit adds the RUNBOOK keyword to alert statements. The field
is optional and expected to be a link.
 2015-06-25 13:00:52 +02:00
Julius Volz 689ed7978f Merge pull request #845 from prometheus/fabxc/apifix 
promql: add MarshalJSON method for ExprType.
 2015-06-25 12:25:45 +02:00
Fabian Reinartz 7f85b9b215 promql: add MarshalJSON method for ExprType. 2015-06-25 12:01:26 +02:00
Brian Brazil 52859b8033 Merge pull request #836 from prometheus/shard 
Add 'hashmod' relabel action.
 2015-06-24 21:40:10 +01:00
Brian Brazil 682f949ab1 Add 'hashmod' relabel action. 
This takes the modulus of a hash of some labels.
Combined with a keep relabel action, this allows
for sharding of targets across multiple prometheus
servers.
 2015-06-24 21:14:53 +01:00
Fabian Reinartz 2677d7b99a Merge pull request #842 from prometheus/fabxc/consulcfg 
retrieval/discovery: refresh services in Consul to recover from missing events
 2015-06-24 17:58:59 +02:00
Julius Volz 9607b8bbdb Merge pull request #840 from prometheus/fix-scrape-errors-ui 
Fix blown-up scrape error display in web UI.
 2015-06-24 17:55:01 +02:00
Julius Volz 32a77085e0 Merge pull request #841 from prometheus/fix-cors-perms 
Disallow cross-origin DELETE and POST requests.
 2015-06-24 17:53:12 +02:00
Fabian Reinartz 23862c92c4 retrieval/discovery: refresh services in Consul to recover from missing events. 2015-06-24 17:48:27 +02:00
Julius Volz bc1c789bab Disallow cross-origin DELETE and POST requests. 2015-06-24 17:26:49 +02:00
Fabian Reinartz 3fcd26b328 Merge pull request #838 from prometheus/fabxc/consulcfg 
config: add omitempty for consul SD config.
 2015-06-24 17:24:05 +02:00
Julius Volz c7039c3a73 Fix blown-up scrape error display in web UI. 2015-06-24 17:22:16 +02:00
Fabian Reinartz 4319b06dd2 config: add omitempty for consul SD config. 2015-06-24 16:22:52 +02:00
Julius Volz 364003c444 Merge pull request #837 from prometheus/update-web 
Update web/blog/files.go with new web content.
 2015-06-24 15:41:36 +02:00
Julius Volz 535a7f2640 Update web/blog/files.go with new web content. 2015-06-24 15:26:01 +02:00
Fabian Reinartz 3e811ad7a4 Merge pull request #827 from prometheus/fabxc/rmt-cleanup 
main: cleanup initialization of remote storage.
 2015-06-24 09:53:47 +02:00
Julius Volz 30fc04b240 Merge pull request #834 from prometheus/improve-dockerfile-deps 
Simplify Go dependency handling in Dockerfile.
 2015-06-24 00:04:02 +02:00
Julius Volz c69b733956 Simplify Go dependency handling in Dockerfile. 
Also, put quotes around the GOPATH in the Makefile for safety in case of
spaces, etc.
 2015-06-23 23:58:09 +02:00
Julius Volz 0e383b0b9f Merge pull request #833 from prometheus/remove-go-get 
Remove unused GO_GET from Makefile.INCLUDE.
 2015-06-23 23:38:41 +02:00
Julius Volz c813eee457 Remove unused GO_GET from Makefile.INCLUDE. 2015-06-23 22:57:41 +02:00
Fabian Reinartz c292979374 retrieval: double timeout in target scrape test. 2015-06-23 21:59:55 +02:00
Fabian Reinartz f149389d29 Merge pull request #828 from prometheus/fabxc/cfgout 
config: show original input on String()
 2015-06-23 21:57:43 +02:00
Julius Volz 9d7fa930ce Merge pull request #831 from prometheus/fix-time-utc 
Switch human-readable times to UTC.
 2015-06-23 21:26:56 +02:00
Julius Volz bbc8b8490e Switch human-readable times to UTC. 
This fixes https://github.com/prometheus/prometheus/issues/829
 2015-06-23 21:26:05 +02:00
Fabian Reinartz 7ec15956e4 config: show original input on String() 2015-06-23 19:40:44 +02:00
Julius Volz cc18191b5e Merge pull request #826 from prometheus/alerting-ui-improvements 
Use TemplateExpander for main pages, improve alerting UI
 2015-06-23 19:03:14 +02:00
Julius Volz d868264bb8 Improve UI of /alerts page. 
Changes to the UI:
- "Active Since" timestamps are now human-readable.
- Alerting rules are now pretty-printed better.
- Labels are no longer just strings, but alert bubbles (like we do on
  the status page for base labels).
- Alert states and target health states are now capitalized in the
  presentation layer rather than at the source.
 2015-06-23 18:48:45 +02:00
Fabian Reinartz 23e77450ff main: cleanup initialization of remote storage. 2015-06-23 18:24:48 +02:00
Julius Volz d7ea0397d4 Use templates.TemplateExpander for all page templates. 
This will allow us to use all of our shiny templating functions in the
main page templates as well.
 2015-06-23 17:53:06 +02:00
Björn Rabenstein 7d0850571d Merge pull request #825 from prometheus/beorn7/doc 
Minor doc fixes.
 2015-06-23 17:07:48 +02:00