5593 Commits

Author SHA1 Message Date
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
v2.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
Fabian Reinartz
6861b3d03d Delete remote file 2017-07-12 13:51:40 +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
Fabian Reinartz
16464c3a33 Merge pull request #2910 from prometheus/adminapi
Admin API
2017-07-11 17:15:49 +02:00
Fabian Reinartz
32226e30f5 Guard reload and quit endpoints by flag 2017-07-11 14:25:07 +02:00
Alexey Palazhchenko
b6f89a1982 Parse custom step parameter correctly. (#2928)
Backport of 6a767b736be5cd4ddf72a8bc6024ac8115713e7d.
Refs #2827, #2861.
2017-07-10 21:05:40 +02:00
Matthias Rampke
f0f2ec7854 Merge pull request #2927 from pafuent/fix-test-short-for-windows
Fixing tests for Windows
2017-07-10 16:11:00 +00:00
Fuente, Pablo Andres
9eb8c6e1d2 Renaming the config_notwin test to config_default 2017-07-10 11:08:16 -03:00
Fabian Reinartz
2067d4cfe2 Merge pull request #2925 from prometheus/fix-alert-labels
Fix alert label display in /alerts UI
2017-07-10 15:32:54 +02:00
Fabian Reinartz
bff55bfa72 Merge pull request #2921 from tomwilkie/2920-test
Add _test.go suffix to promql/bench.go, split test.go in to two.
2017-07-10 12:00:58 +02:00
Fabian Reinartz
45ac064669 web: disable Amin APIs by default 2017-07-10 09:29:41 +02:00
Fabian Reinartz
ccf9e62972 *: add admin grpc API 2017-07-10 09:14:14 +02:00
Fuente, Pablo Andres
fe73de9452 Renaming config test file to fix build tags
Renaming the name of a file of the config tests, in order to properly
use the Go build tags feature.
2017-07-10 00:02:08 -03:00
Fuente, Pablo Andres
193dc47230 Fixing code style to adhere gofmt 2017-07-09 02:43:33 -03:00
Fuente, Pablo Andres
902fafb8e7 Fixing tests for Windows
Fixing the config/config_test, the discovery/file/file_test and the
promql/promql_test tests for Windows. For most of the tests, the fix involved
correct handling of path separators. In the case of the promql tests, the
issue was related to the removal of the temporal directories used by the
storage. The issue is that the RemoveAll() call returns an error when it
tries to remove a directory which is not empty, which seems to be true due to
some kind of process that is still running after closing the storage. To fix
it I added some retries to the remove of the temporal directories.
Adding tags file from Universal Ctags to .gitignore
2017-07-09 01:59:30 -03:00