mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-18 19:44:06 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
5175 commits 249 branches 440 tags 659 MiB
Commit graph

5175 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz a007eb2e1e vendor: update prometheus/tsdb to single head mode 2017-09-07 14:14:33 +02:00
Fabian Reinartz 6ab652e3dc Merge pull request #3144 from wgliang/master 
should use time.Since instead of time.Now().Sub
 2017-09-07 13:51:46 +02:00
Fabian Reinartz a0280cc489 Merge pull request #3142 from prometheus/fish/fix-k8s-ingress-type 
k8s: Use versioned struct for ingress discovery
 2017-09-07 13:51:20 +02:00
wangguoliang 7e6c6020ff should use time.Since instead of time.Now().Sub 
Signed-off-by: wgliang <liangcszzu@163.com>
 2017-09-07 18:00:45 +08:00
Johannes 'fish' Ziemke 75aec7d970 k8s: Use versioned struct for ingress discovery 2017-09-06 12:47:03 +02:00
Krasi Georgiev 153cb0cbe3 scraping errors will show in the log when debug mode is enabled (#3135) 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-09-05 11:55:14 +01:00
Fabian Reinartz 87918f3097 Merge branch 'master' into dev-2.0 2017-09-04 14:09:21 +02:00
Fabian Reinartz c70379e1c7 Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0 2017-09-04 13:10:50 +02:00
Johannes 'fish' Ziemke 70f3d1e9f9 k8s: Support discovery of ingresses (#3111) 
* k8s: Support discovery of ingresses

* Move additional labels below allocation

This makes it more obvious why the additional elements are allocated.
Also fix allocation for node where we only set a single label.

* k8s: Remove port from ingress discovery

* k8s: Add comment to ingress discovery example
 2017-09-04 13:10:44 +02:00
Fabian Reinartz fffe51fb03 Add mutex and block profiling via envvar 2017-09-04 13:10:32 +02:00
Tobias Schmidt 29fff1eca4 Merge pull request #2966 from alkalinecoffee/consul-node-metadata 
Add support for consul's node metadata
 2017-09-02 18:43:25 +02:00
Tobias Schmidt d0a02703a2 Merge pull request #3105 from sak0/dev 
discovery openstack: support discovery hypervisors, add rule option.
 2017-08-31 14:08:16 +02:00
CuiHaozhi b1c18bf29b discovery openstack: support discovery hosts, add rule option. 
Signed-off-by: CuiHaozhi <cuihz@wise2c.com>
 2017-08-29 10:14:00 -04:00
Julius Volz aa5cdcb11e Remove extra space in log output 2017-08-29 15:24:00 +02:00
gdmello 35c952e344 Added logging for remote storage adapter (#3106) 
* Added logging for remote storage adapter on startup and on any error condition during /read or /write.

* CR feedback.
 2017-08-29 15:22:56 +02:00
Lynn Lin 1bf25dc1b2 fix issues reported by gofmt and spelling typo (#3127) 2017-08-29 09:00:11 +01:00
Ben Kochie 59aca4138b Fix staticcheck issues. 2017-08-28 17:29:01 +02:00
Ben Kochie 0fcfe3209f Add staticcheck to build. 2017-08-28 17:29:01 +02:00
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
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
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
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
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 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