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

5260 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Björn Rabenstein a5ddcf5fb2 Merge pull request #2979 from prometheus/beorn7/storage2 
Fix iterator issue in varbit chunk
 2017-07-21 19:38:23 +02:00
beorn7 ea5e7eafde Fix #2965 
We would overscan when hitting a value directly, interspersed with
samples in between timestamps. Apparently, that happens rarely enough
that it was only noticed recently.
 2017-07-21 16:35:15 +02:00
beorn7 c06292af2f Add test to expose #2965 2017-07-21 16:25:24 +02:00
Felicity f30b10223a documentation: update Kubernetes example for 1.7 (#2918) 
Kubernetes 1.7+ no longer exposes cAdvisor metrics on the Kubelet
metrics endpoint.  Update the example configuration to scrape cAdvisor
in addition to Kubelet.  The provided configuration works for 1.7.3+
and commented notes are given for 1.7.2 and earlier versions.

Also remove the comment about node (Kubelet) CA not matching the master
CA.  Since the example no longer connects directly to the nodes, it
doesn't matter what CA they're using.

References:

- https://github.com/kubernetes/kubernetes/issues/48483
- https://github.com/kubernetes/kubernetes/pull/49079
 2017-07-21 14:10:02 +02:00
Julius Volz cc50aa2c6b main: Consistently end flag descriptions with periods. (#2977) 2017-07-20 23:48:35 +02:00
Tom Wilkie cf105f9d57 Update example remote adapters for change in proto location. 2017-07-19 16:39:02 +01:00
Tom Wilkie ec999ff397 Prevent number of remote write shards from going negative. 
This can happen in the situation where the system scales up the number of shards massively (to deal with some backlog), then scales it down again as the number of samples sent during the time period is less than the number received.
 2017-07-19 16:32:09 +01:00
Tom Wilkie 1d94eb8d95 Prevent number of remote write shards from going negative. 
This can happen in the situation where the system scales up the number of shards massively (to deal with some backlog), then scales it down again as the number of samples sent during the time period is less than the number received.
 2017-07-19 16:27:19 +01:00
Joe Martin aba41c7d0f add support for consul's node metadata 2017-07-18 16:46:16 -04:00
Joe Martin 7f2402085a update consul api dependency 2017-07-18 16:46:08 -04:00
Alexey Palazhchenko 76c9a0d931 Fix typo (#2963) 2017-07-18 16:11:10 +01:00
Alexey Palazhchenko 695ec0b981 Fix few typos. (#2962) 2017-07-18 13:58:00 +01:00
Tom Wilkie 1f3b59ccf5 s/met/lset/ 2017-07-18 11:42:29 +01:00
Julius Volz c6f41ce391 Allow metric and label names to begin with underscores (#2961) 
While this is not recommended, it is allowed in our data model
(https://prometheus.io/docs/concepts/data_model/).

Fixes https://github.com/prometheus/prometheus/issues/2959
 2017-07-18 12:35:41 +02:00
J. Taylor O'Connor 5a19ffb315 A few spelling corrections. (#2960) 2017-07-17 22:13:50 +01:00
Brian Brazil 84be97bd98 Tweaks to SD README from review 2017-07-17 14:20:54 +01:00
Brian Brazil 2a9ca394dd Document how/when to write service discovery (#2943) 2017-07-14 15:22:09 +01:00
Tom Wilkie a09acdcc5b Make concreteSeriersIterator behave. 2017-07-13 18:33:08 +01:00
Goutham Veeramachaneni 4194d2ac79 Call At() only if Next() is true 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-13 18:42:45 +02:00
Tom Wilkie 994a7f27d6 Propagate errors through mergeSeriesSet correctly. 2017-07-13 15:02:01 +01:00
Tom Wilkie 2e0d8487e3 Return zeros if At() is called after Next() returns false. 2017-07-13 14:40:29 +01:00
Fabian Reinartz 931f2705f2 Merge pull request #2942 from prometheus/fabxc-patch-1 
Fix command line flags in Dockerfile
 2017-07-13 12:53:56 +02:00
Tom Wilkie 014bd31a86 Remove unnecessary whitespace changes, add comment. 2017-07-13 11:26:46 +01:00
Fabian Reinartz 377a549fe6 Fix command line flags in Dockerfile 2017-07-13 12:14:49 +02:00
Tom Wilkie 98ac07f86a Add unit test for the merging on the read path. 2017-07-13 11:05:38 +01:00
Tom Wilkie 2ac1809a5b Get label set from cache in addReportSample. 2017-07-12 22:09:16 +01:00
Tom Wilkie b568ace7ce Move protos to ./prompb 2017-07-12 22:06:35 +01:00
Tom Wilkie 240feb313b Don't regenerate label set for cached values. 2017-07-12 15:54:38 +01:00
Tom Wilkie 96e25adc8d Introduce 'primary' storage in fanout, and have Add return the ref from the primary. 
Also, ensure all append batches are rolled back when a commit or rollback fails.
 2017-07-12 15:51:05 +01:00
Tom Wilkie db8128ceeb Add label set as first parameter to AddFast, ingored by TSDB adapter. 2017-07-12 15:20:12 +01:00
Fabian Reinartz 2b5d915953 Merge pull request #2937 from prometheus/cutbeta 
Cut 2.0.0-beta.0
 2017-07-12 14:18:41 +02:00
Fabian Reinartz 724505e53e *: cut v2.0.0-beta.0 2017-07-12 14:01:56 +02:00
Fabian Reinartz 6aee36ac3b vendor: update prometheus/tsdb 2017-07-12 14:01:56 +02:00