mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-30 12:47:33 -07:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity
7154 commits 214 branches 425 tags 748 MiB
Commit graph

7154 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Bostock 64973f5c65 cmd/prometheus: Fix capitalisation in log line (#3123) 
Change 'Ready' to 'ready'.
 2017-08-28 11:03:25 +01:00
Matt Bostock d31c068ae4 api.go: Fix typo in comment (#3122) 2017-08-28 11:03:07 +01:00
Fabian Reinartz 215a856f34 Just check for general error in WAL test 
Go 1.9 changed the returned error. Checking the exact message is too
fragile.
 2017-08-27 16:57:43 +02:00
Brian Brazil 78205b76e9 Update Prometheus console template example for 2.0 (#3100) 2017-08-26 21:46:12 +01:00
Richard Hartmann 923be6a418 Merge pull request #3113 from prometheus/RichiH-patch-1 
Point help to docs, not main Prometheus website
 2017-08-26 20:18:13 +02:00
Fabian Reinartz 1b86bbb48a Merge pull request #130 from mdlayher/crc32-once 
Add newCRC32 function to simplify hash initialization
 2017-08-26 18:18:48 +02:00
Matt Layher 78b15c3434
Add newCRC32 function to simplify hash initialization 2017-08-26 12:04:00 -04:00
Goutham Veeramachaneni e2e2947ee8 Merge pull request #128 from Gouthamve/expose-types 
Expose types for easier interface implementations.
 2017-08-25 21:29:53 +05:30
Goutham Veeramachaneni c463b0c8c8
Expose NewMergedSeriesSet for merging SeriesSets 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-08-25 19:36:24 +05:30
Goutham Veeramachaneni 5b242f35ba Expose a Querier with manually passed in readers. 
Allows people to not copy the querying code.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-08-25 16:06:45 +05:30
Goutham Veeramachaneni 7438ed7035 Expose Intervals type for use by TombstoneReader. 
TombstoneReader is exposed but Intervals is not.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-08-25 16:06:36 +05:30
Richard Hartmann aa3fb1e7c4 Point help to docs, not main Prometheus website 
No matter how we refactor docs, `/docs/` will stay the prefix, so there's not long-term risk in changing this.

One we version docs, we should probably try and keep link & version in sync.
 2017-08-25 10:53:36 +02:00
Tobias Schmidt 3a4ee617e0 Merge pull request #3062 from cstyan/callum-1553 
check if file_sd files exists in checkConfig
 2017-08-24 13:35:07 +02:00
Tobias Schmidt d6a0f46baf Fix formatting of GitHub issue template 
There is actually an easier way to format comments, which doesn't
require a hack and also fixes the dispay in non-monospace fonts.
 2017-08-24 13:33:16 +02:00
Fabian Reinartz 0c81d5f719 storage: instantiate correct block ranges 2017-08-24 12:36:07 +02:00
Tobias Schmidt 57a9de4a9a Merge pull request #3076 from Colstuwjx/fix/nil-target-group 
Fix target group foreach nil bug.
 2017-08-24 01:00:44 +02:00
Mark Adams 77c816b309 Fix pprof endpoints when -web.route-prefix or -web.external-url is used (#3054) 
Whenever a route prefix is applied, the router prepends the prefix to
the URL path on the request. For most handlers, this is not an issue
because the request's path is only used for routing and is not actually
needed by the handler itself. However, Prometheus delegates the handling
of the /debug/* endpoints to the http.DefaultServeMux which has it's own
routing logic that depends on the url.Path. As a result, whenever a
prefix is applied, the prefixed URL is passed to the DefaultServeMux
which has no awareness of the prefix and returns a 404.

This change fixes the issue by creating a new serveDebug handler which
routes requests /debug/* requests to appropriate net/http/pprof handler
and removing the net/http/pprof import in cmd/prometheus since it is no
longer necessary.

Fixes #2183.
 2017-08-23 00:00:56 +01:00
Callum Styan 8912f81ffe check if file_sd files exist in checkConfig 2017-08-22 15:25:30 -07:00
Goutham Veeramachaneni 79dc0ed420 Merge pull request #126 from ankon/pr/issue-125 
Log the directory when the WAL cannot be opened
 2017-08-22 14:52:30 +05:30
Andreas Kohn 4003da0fdd
Log the directory when the WAL cannot be opened 
Fixes #125
 2017-08-22 11:17:07 +02:00
Colstuwjx 2b49df2c61 Fix target group foreach nil bug, directly return err. 2017-08-22 08:37:39 +08:00
Tobias Schmidt 32a951ec89 Add a big notice header to the github issue template header (#3103) 
Trying to prevent usage questions in Github issue, this change adds a
multi-line notice header directing people to the mailing list.
 2017-08-22 00:46:49 +01:00
Brian Brazil 2354c2544b Set timestamp for date functions (#3070) 2017-08-21 17:15:25 +01:00
Brian Brazil 7ebd74b84b Cut down console template examples to just node and prometheus (#3099) 
These haven't seen much love, and grafana.com dashboard sharing
has become more promiment. Keep 2 for the sake of demos.
 2017-08-21 16:35:20 +01:00
maximecharron 41884f0283 Fix double redirect if there is a route-prefix (#3091) 2017-08-19 19:44:15 +01:00
Fabian Reinartz a52f082939 *: cut v2.0.0-beta.2 2017-08-18 10:12:25 +02:00
Fabian Reinartz 86e5c90061 Merge pull request #3087 from prometheus/cut-beta2 
vendor: update prometheus/tsdb
 2017-08-18 10:11:30 +02:00
Fabian Reinartz 24b246ac28 vendor: update prometheus/tsdb 2017-08-18 10:08:59 +02:00
Fabian Reinartz c4ca881685 Merge pull request #120 from Gouthamve/fix-0-division 
Fix panic caused by 0 division
 2017-08-18 09:54:27 +02:00
Goutham Veeramachaneni 178f840295 Fix panic caused by 0 division 
Introduced in #108

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-08-18 07:45:29 +02:00
Max Inden 3101606756 Merge pull request #2711 from mxinden/api-config 
Expose current Prometheus config via /status/config
 2017-08-14 19:01:13 +02:00
Fabian Reinartz 7d8cd4e6bf Merge pull request #3057 from sak0/dev 
discovery openstack: handle instances without ip
 2017-08-14 14:46:51 +02:00
Max Leonard Inden 1c96fbb992
Expose current Prometheus config via /status/config 
This PR adds the `/status/config` endpoint which exposes the currently
loaded Prometheus config. This is the same config that is displayed on
`/config` in the UI in YAML format. The response payload looks like
such:
```
{
  "status": "success",
  "data": {
    "yaml": <CONFIG>
  }
}
```
 2017-08-13 22:21:18 +02:00
Karsten Weiss 5f5d77848e Fix 'predefined escaper "html" disallowed in template' in /targets (#3046) (#3050) 
Issue #3046 is triggered by html/template changes in go1.9.

See https://tip.golang.org/pkg/html/template. Quote:

//   To ease migration to Go 1.9 and beyond, "html" and "urlquery" will
//   continue to be allowed as the last command in a pipeline. However, if the
//   pipeline occurs in an unquoted attribute value context, "html" is
//   disallowed. Avoid using "html" and "urlquery" entirely in new templates.

The commit also includes a trivial whitespace fix.
 2017-08-11 18:31:46 +01:00
CuiHaozhi 31b6f8b04c discovery openstack: handle instances without ip 
Signed-off-by: CuiHaozhi <cuihz@wise2c.com>
 2017-08-11 12:36:12 -04:00
Fabian Reinartz 4dcb465029 Merge pull request #3058 from prometheus/cut-beta1 
*: cut 2.0.0-beta.1
 2017-08-11 14:09:11 +02:00
Fabian Reinartz 2797fb4e73 *: cut 2.0.0-beta.1 2017-08-11 13:47:24 +02:00
Fabian Reinartz 146191a913 vendor: update prometheus/tsdb 2017-08-11 13:47:15 +02:00
Fabian Reinartz e0aca4bee9 Merge pull request #119 from prometheus/allocsave 
Allocsave
 2017-08-11 12:42:10 +02:00
Fabian Reinartz 752d8bad15 Merge pull request #3056 from prometheus/mergemaster 
Merge master into dev-2.0
 2017-08-11 12:12:59 +02:00
Fabian Reinartz 921c6ebb3b Merge branch 'dev-2.0' into mergemaster 2017-08-10 17:27:52 +02:00
Björn Rabenstein f1067f4cf9 Merge pull request #3051 from prometheus/beorn7/web 
Update web/ui/bindata.go
 2017-08-10 17:16:51 +02:00
Fabian Reinartz 25f3e1c424 Merge branch 'master' into mergemaster 2017-08-10 17:04:25 +02:00
Fabian Reinartz 814ecf224f Merge pull request #3053 from prometheus/tsdbvendor 
Vendor TSDB performance optimizations and fixes
 2017-08-10 15:05:19 +02:00
Fabian Reinartz 3519deae06 Merge pull request #3052 from prometheus/connleak 
Kill idle connections after 5 minutes
 2017-08-10 15:03:24 +02:00
Fabian Reinartz 2037778d14 vendor: update TSDB 2017-08-10 14:51:02 +02:00
Fabian Reinartz 0af43695de web: log error missages on serving 2017-08-10 14:48:31 +02:00
Fabian Reinartz 9516d04472 util: Add idle timeout for scrape connections 2017-08-10 14:47:51 +02:00
Fabian Reinartz f9f439c6db Merge pull request #118 from prometheus/allocsave2 
Avoid chunk allocations and refactor compactions
 2017-08-10 14:45:54 +02:00
beorn7 6cf62fe8ba Update web/ui/bindata.go 2017-08-10 14:40:19 +02:00