mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-13 09:04:06 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
4393 commits 247 branches 438 tags 656 MiB
Commit graph

4393 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
beorn7 6cf62fe8ba Update web/ui/bindata.go 2017-08-10 14:40:19 +02:00
Roman Khavronenko 245b8a0b37 Allow to collapse jobs at /targets page (#2628) 2017-08-09 17:10:30 +02:00
Pablo Andres Fuente c79a4db812 Adding tests for util/httputil/client (#3002) 
Adding tests for util/httputil/client with a 100% coverage.
Removing the NewDeadlineRoundTripper from util/httputil/client because
is not used.
Adding a new test util to check http.Request in http.RoundTrip interface
implementors.
 2017-08-09 13:23:57 +01:00
Goutham Veeramachaneni 3bee362727 Merge pull request #3037 from KalivarapuReshma/single-dash-error 
Change -config.file to --config.file in Readme and error message
 2017-08-09 08:03:43 +05:30
KalivarapuReshma 686050d816 Change -config.file to --config.file in Readme and error message 2017-08-08 12:49:35 +05:30
Tobias Schmidt 1ea9ab601e Merge pull request #2997 from emluque/2831-Healthy_Ready_Endpoints 
Add `/-/healthy` and `/-/ready` endpoints #2831
 2017-08-07 23:35:07 +02:00
emluque ff54c5c11a 2831 Add Healthy and Ready endpoints 2017-08-07 17:34:04 -03:00
Brian Brazil 4c8173acac Use timestamp of a sample in deriv() to avoid FP issues (#2958) 
With the squaring of the timestamp, we run into the
limitations of the 53bit mantissa for a 64bit float.

By subtracting away a timestamp of one of the samples (which is how the
intercept is used) we avoid this issue in practice as it's unlikely
that it is used over a very long time range.

Fixes #2674
 2017-08-07 17:15:38 +01:00
Yuki Ito 1bf3b91ae0 Make sure that url for remote_read/write is not nil (#3024) 2017-08-07 08:49:45 +01:00
Fabian Reinartz 62047e5c97 Merge pull request #2980 from Gouthamve/contrib.md 
Add section for new contributors
 2017-08-03 15:45:14 +02:00
Fabian Reinartz 4d3d8ee229 Merge pull request #2850 from tomwilkie/dev-2.0-remote 
Remote APIs for v2
 2017-08-03 13:39:09 +02:00
Tom Wilkie e1c77cdfd4 Merge pull request #2991 from tomwilkie/2990-remote-config 
Make queue manager configurable.
 2017-08-03 10:26:29 +01:00
Edward Marshall c490725ac9 Additional targetScrapeSample metrics (#3018) 2017-08-02 13:10:18 +01:00
Fabian Reinartz ac511ecf30 Merge pull request #2970 from Gouthamve/docs/sd-interface 
Add docs about SD interface
 2017-08-01 22:44:28 +02:00
Tom Wilkie 5169f990f9 Review feedback: add yaml struct tags, don't embed queue config. 
Also, rename QueueManageConfig to QueueConfig, for consistency with tags.
 2017-08-01 14:43:56 +01:00
Tom Wilkie b11bc8ae24 Fix some comments. 2017-08-01 11:19:35 +01:00
Tom Wilkie 4c5c22dcf1 Rename proto package from remote -> prometheus. 2017-08-01 11:12:34 +01:00
Goutham Veeramachaneni ab96e79bc8 Add docs about SD interface 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-08-01 13:53:50 +05:30
Fabian Reinartz bc2e9459d8 Merge pull request #2973 from tomwilkie/2969-negative-shards 
Prevent number of remote write shards from going negative.
 2017-07-28 13:02:33 +02:00
Fabian Reinartz 40db026381 Merge pull request #2957 from prometheus/sd-doc 
Tweaks to SD README from review
 2017-07-28 08:51:50 +02:00
Fabian Reinartz 2ed3a9bd62 Merge pull request #2946 from Gouthamve/fix-at-after-false 
Call At() only if Next() is true
 2017-07-28 08:51:19 +02:00
Goutham Veeramachaneni 11ee713ced Handle common escape characters properly. (#2995) 
Fixes #2974

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-27 15:15:41 +02:00
Fabian Reinartz f9bf4c86ae Merge pull request #2998 from prometheus/vendorkinpin 
vendor: update kingpin
 2017-07-27 13:48:13 +02:00
Goutham Veeramachaneni d733769722 Add section for new contributors 
Inspiration from this blog post: https://manishearth.github.io/blog/2016/01/03/making-your-open-source-project-newcomer-friendly/

Some parts are lifted from: https://github.com/servo/servo/blob/master/CONTRIBUTING.md

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-27 16:53:34 +05:30
Fabian Reinartz 4acb1d2b21 vendor: update kingpin 2017-07-27 13:08:20 +02:00
Tom Wilkie 454b661145 Make queue manager configurable. 2017-07-25 13:47:34 +01:00
Conor Broderick 4b868113bb Metric name validation (#2975) 2017-07-24 13:49:20 +01:00
beorn7 3bb0667607 Merge branch 'release-1.7' 2017-07-21 19:40:30 +02:00