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
7062 commits 249 branches 440 tags 659 MiB
Commit graph

7062 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
tianwenjie01 b64054365d Fix DefaultOptions 2017-07-18 17:42:58 +08: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
Fabian Reinartz 8d3a398113 Merge pull request #109 from prometheus/fixes 
Fix compactions
 2017-07-14 13:45:46 +02:00
Fabian Reinartz 74f67e8271 Fix compacting disable/enable 
Enabling and disabling compaction no longer blocks are potentially
causes panics.
 2017-07-14 10:08:05 +02:00
Fabian Reinartz 3065be97d8 Fix and document locking order for DB 2017-07-14 09:00:22 +02:00
Fabian Reinartz 47afc8e00f Reduce test timeout on Travis 2017-07-14 08:00:18 +02: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
Fabian Reinartz 9c4235532e Fix compaction selection after creating new heads 
This fixes the case where between block creations no compaction
plans are ran. We were not compacting anything in these
cases since the on creation the most recent head block always had
a high timestamp of 0.
 2017-07-13 16:15:13 +02:00
Fabian Reinartz 5d7b5994d6 Fix compaction range selection 2017-07-13 16:13:59 +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
Goutham Veeramachaneni 3c22488157 Merge pull request #108 from Gouthamve/compact-large-dels-2 
Recompact blocks with large number of tombstones
 2017-07-12 18:54:01 +02:00
Goutham Veeramachaneni 401bdfd4a6 Make Chunks return the number of samples inside 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-12 18:45:12 +02:00
Goutham Veeramachaneni 1263a68875 Recompact blocks with large number of tombstones 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-12 18:27:31 +02:00
Goutham Veeramachaneni 7b9c536883 Merge pull request #103 from Gouthamve/block-ranges 
Compaction implementation for block-ranges
 2017-07-12 17:32:49 +02:00
Goutham Veeramachaneni 9a2ab732b5 Choose ranges by retention and min-block-duration 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-12 17:30:34 +02: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
Goutham Veeramachaneni 969c407335 Merge pull request #106 from Gouthamve/snapshot-time 
Persist the right MaxTime when snapshotting
 2017-07-12 13:54:31 +02:00
Fabian Reinartz 6861b3d03d Delete remote file 2017-07-12 13:51:40 +02:00
Goutham Veeramachaneni f1ae239c20 Persist the right MaxTime when snapshotting 
This is because we cut a new block from where the snapshotted block ends
if we restore from backups and highTimestamp would be where we should be
 starting from.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-12 13:48:13 +02:00
Tom Wilkie 2dda5775e3 Initial port of remote storage to v2. 2017-07-12 12:27:57 +01:00
Martín Ferrari bb13a23d29 Merge pull request #2934 from TheTincho/fix-migrated-url-redirect 
Add PATH_PREFIX to redirectToMigratedURL
 2017-07-11 20:31:22 +01:00
Martín Ferrari 64cfe2e7f5 Add PATH_PREFIX to redirectToMigratedURL 
Old grafana versions use this format, and it breaks with prometheus instances
not mounted in the root directory.
 2017-07-11 17:36:17 +00:00
Fabian Reinartz dba7586671 Merge branch 'master' into dev-2.0 2017-07-11 17:22:14 +02:00