RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-27 17:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,910 Commits 243 Branches 444 Tags 653 MiB
835eb8c653
Commit Graph

3910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Christian Groschupp
8f781e411c Openstack Service Discovery (#2701) 
* Add openstack service discovery.

* Add gophercloud code for openstack service discovery.

* first changes for juliusv comments.

* add gophercloud code for floatingip.

* Add tests to openstack sd.

* Add testify suite vendor files.

* add copyright and make changes for code climate.

* Fixed typos in provider openstack.

* Renamed tenant to project in openstack sd.

* Change type of password to Secret in openstack sd.
 2017-06-01 23:49:02 +02:00
Roman Vynar
dbe2eb2afc Hide consul token on UI. (#2797) 2017-06-01 22:14:23 +01:00
Fabian Reinartz
a391156dfb Merge pull request #2667 from goller/go-discovery-logger 
Add logger injection into discovery services
 2017-06-01 10:20:10 -07:00
Mitsuhiro Tanda
a1ddab463e config: set default region for EC2 SD 2017-06-02 01:40:24 +09:00
Chris Goller
42de0ae013 Use log.Logger interface for all discovery services 2017-06-01 11:25:55 -05:00
Tom Wilkie
24a113bb09 Review feedback: limit number of bytes read under error. 2017-06-01 11:21:48 +01:00
Tom Wilkie
46abe8cbf2 Remote write: read first line of response and include it in the error. 2017-05-31 13:46:08 +01:00
Tobias Schmidt
1c9499bbbd Merge pull request #2785 from prometheus/grobie/fix-target-group-naming 
Fix outdated target_group naming in error message
 2017-05-31 11:28:46 +02:00
Tobias Schmidt
287ec6e6cc Fix outdated target_group naming in error message 
The target_groups config has been renamed to static_configs, the error
message for overflow attributes should reflect that.
 2017-05-31 11:01:13 +02:00
Julius Volz
240bb671e2 config: Fix overflow checking in global config (#2783) 2017-05-30 20:58:06 +02:00
Julius Volz
e0f046396a Fix InfluxDB retention policy usage in read adapter (#2781) 2017-05-29 16:24:24 +02:00
Stephan Erb
14eee34da3 Update vendored go-zookeeper client (#2778) 
It is likely this will fix #2758.
 2017-05-29 15:59:30 +02:00
Benjamin
51626f2573 change deprecated maintainer to label (#2724) 2017-05-29 15:58:40 +02:00
Conor Broderick
6766123f93 Replace regex with Secret type and remarshal config to hide secrets (#2775) 2017-05-29 12:46:23 +01:00
Brian Brazil
d66799d7f3 Show gaps in graphs. (#2766) 
Fixes #345
 2017-05-26 16:17:48 +01:00
Tobias Schmidt
2a426bfead Revert "Use tag names consistently (#2743)" 
Apparently, a decision was made at some point to only use the v prefix
in tags and similar contexts where other things can appear. There was a
vote to stick to that decision. For more information, read
https://github.com/prometheus/prometheus/pull/2743.

This reverts commit 5405a4724f.
 2017-05-25 08:57:01 +02:00
conorbroderick
9c953064c3 check if result is a scalar in order to display correct number of returned time series 2017-05-24 14:07:24 +01:00
Fabian Reinartz
09fcbf78df Merge pull request #2755 from brancz/redirect-prefix 
prefix redirect with external url path
 2017-05-24 10:09:47 +02:00
Tobias Schmidt
5405a4724f Use tag names consistently (#2743) 2017-05-23 14:14:15 +02:00
Frederic Branczyk
ad22606a3d
web: prefix redirect with ExternalURL path 2017-05-22 14:56:52 +02:00
Frederic Branczyk
45df5c2daf
Merge branch 'release-1.6' 2017-05-22 13:44:44 +02:00
Jacky Wu
75b89739de Fix go version hint. (#2750) 2017-05-20 18:33:14 +02:00
Frederic Branczyk
7d17ecbd48 Merge pull request #2735 from brancz/cut-1.6.3 
cut 1.6.3
 2017-05-18 16:56:54 +02:00
Frederic Branczyk
53a2bd71b9
*: cut 1.6.3 2017-05-18 16:51:46 +02:00
Tobias Schmidt
2ae2b663a9
Create sha256 checksums file during release 2017-05-18 16:50:44 +02:00