Commit graph

3935 commits

Author SHA1 Message Date
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
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
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
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
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
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
Alexey Palazhchenko b6f89a1982 Parse custom step parameter correctly. (#2928)
Backport of 6a767b736b.
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 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
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
Tom Wilkie 835eb8c653 Add _test.go suffix to promql/{bench.go, test.go} to prevent importing the testing package in a normal binary. 2017-07-07 15:52:44 +01:00
Fabian Reinartz be990c0287 Merge pull request #2907 from Gouthamve/log-tm
Log the stopping of TargetManager in Info
2017-07-06 12:00:11 +02:00
Goutham Veeramachaneni a607873ad2 Log the stopping of TargetManager in Info
Fixes #2715

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-07-06 11:44:07 +02:00
Fabian Reinartz e58e7954a7 Merge pull request #2904 from Gouthamve/srclbl-omitempty
Make sure rendering config produces valid config
2017-07-05 16:24:18 +02:00
Goutham Veeramachaneni 98d20d5880 Make sure rendering config produces valid config
Fixes #2899

Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
2017-07-05 16:09:29 +02:00
Fabian Reinartz 3ed4fea58c Merge pull request #2902 from mattbostock/patch-2
Remote queue manager: Fix typo
2017-07-05 11:57:52 +02:00
Matt Bostock 13c6e4a4bc Remote queue manager: Fix typo
Change 'send' to 'sent'.
2017-07-04 20:48:52 +01:00
Alin Sinpalean 38de290d5f Console graph color scheme support (#2900)
Add a colorScheme parameter to PromConsole.Graph, to allow using custom colors in console graphs.
2017-07-04 15:30:12 +01:00
Tobias Schmidt 43075d0215 Merge pull request #2865 from mattbostock/add_marathon_port_ordinal_label
Marathon SD: Set port index label
2017-06-23 12:57:09 +02:00
Matt Bostock ab4d64959f Marathon SD: Set port index label
The changes [1][] to Marathon service discovery to support multiple
ports mean that Prometheus now attempts to scrape all ports belonging to
a Marathon service.

You can use port definition or port mapping labels to filter out which
ports to scrape but that requires service owners to update their
Marathon configuration.

To allow for a smoother migration path, add a
`__meta_marathon_port_index` label, whose value is set to the port's
sequential index integer. For example, PORT0 has the value `0`, PORT1
has the value `1`, and so on.

This allows you to support scraping both the first available port (the
previous behaviour) in addition to ports with a `metrics` label.

For example, here's the relabel configuration we might use with
this patch:

    - action: keep
      source_labels: ['__meta_marathon_port_definition_label_metrics', '__meta_marathon_port_mapping_label_metrics', '__meta_marathon_port_index']
      # Keep if port mapping or definition has a 'metrics' label with any
      # non-empty value, or if no 'metrics' port label exists but this is the
      # service's first available port
      regex: ([^;]+;;[^;]+|;[^;]+;[^;]+|;;0)

This assumes that the Marathon API returns the ports in sorted order
(matching PORT0, PORT1, etc), which it appears that it does.

[1]: https://github.com/prometheus/prometheus/pull/2506
2017-06-23 09:52:52 +01:00
Alexey Palazhchenko 6a767b736b Parse custom step parameter correctly. (#2861)
Fixes #2827.
2017-06-19 17:22:59 +01:00
Fabian Reinartz f46a8e9ea4 Merge pull request #2854 from prometheus/promql-rune
Check for invalid utf-8 in lexer strings.
2017-06-17 14:42:20 +02:00
Brian Brazil 6f5d952132 Check for invalid utf-8 in lexer strings.
This protects against invalid utf-8 sneaking
in via label_replace.
2017-06-16 15:19:24 +01:00
Harsh Agarwal 16867c89a7 implement label_join issue 1147 (#2806)
Replace OptionalArgs int with Variadic int.
2017-06-16 14:51:22 +01:00
Fabian Reinartz c89f8753f5 Merge pull request #2828 from prometheus/sd-label-valid
Check target labels are valid. Check for address after relabelling.
2017-06-16 10:43:45 +02:00
Fabian Reinartz 9ba61df45a Merge pull request #2789 from mtanda/aws_default_region
config: set default region for EC2 SD
2017-06-12 16:15:53 +02:00
Frederic Branczyk 3afb3fffa3 Merge pull request #2836 from brancz/cut-1.7.1
cut 1.7.1
2017-06-12 13:41:21 +02:00
Frederic Branczyk aef7104791
cut 1.7.1 2017-06-12 11:44:04 +02:00
Fabian Reinartz f71d39a053 Merge pull request #2832 from brancz/fix-redirect
web: fix double prefix redirect
2017-06-12 10:40:43 +02:00
Frederic Branczyk 9063f8dedd
web: fix double prefix 2017-06-10 12:07:43 +02:00
Brian Brazil d8b4995ddd Check target labels are valid. Check for address after relabelling.
Fixes #2822
Fixes #2819
2017-06-09 16:18:19 +01:00
Frederic Branczyk bfa37c8ee3 Merge pull request #2814 from brancz/cut-1.7.0
cut 1.7.0
2017-06-07 11:40:29 +02:00
Frederic Branczyk 5d9ac3565e Merge pull request #2786 from tomwilkie/report-error-in-remote-write
Remote write: read first line of response and include it in the error.
2017-06-07 10:21:34 +02:00
Frederic Branczyk 6d29f0c19f
cut 1.7.0 2017-06-07 10:00:48 +02:00
Frederic Branczyk d26f789cb0 Merge pull request #2816 from brancz/gophercloud-vendoring
vendor: fix mixed versions of gophercloud packages
2017-06-07 09:54:31 +02:00
Frederic Branczyk d6a55c3013
vendor: fix mixed versions of gophercloud packages 2017-06-07 09:21:43 +02:00
Mitsuhiro Tanda 64cef5cd05 handle NewSession() error 2017-06-06 22:02:50 +09:00