mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 15:09:39 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
4189 commits 243 branches 444 tags 649 MiB
Commit graph

4189 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 b420412135 Merge pull request #2915 from Gouthamve/parse-fuz 
textparse: Add fuzzing and fix bug caught
 2017-07-07 13:15:55 +02:00
Goutham Veeramachaneni b7eddbcd98 textparse: Add fuzzing and fix bug caught 
See https://github.com/cznic/golex/issues/11 for info on the bug

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-07 11:12:17 +02:00
Fabian Reinartz 9c8be7575c Merge pull request #2906 from Gouthamve/error-ptr-match 
Convert tsdb.ErrOutOfBounds to a storage error
 2017-07-06 17:26:26 +02:00
Fabian Reinartz dc15a6f6ea vendor: add and update proto/grpc vendoring 2017-07-06 14:38:20 +02:00
Goutham Veeramachaneni 243419c007 Return tsdb.ErrOutOfBounds as storage.ErrOutOfBounds 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-06 14:18:31 +02: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 8a2850b5e1 vendor: add missing app engine dependencies 2017-07-05 16:39:50 +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
Fabian Reinartz 24e9deac71 Merge pull request #2859 from Gouthamve/docker-nobody 
Dockerfile: Run as nobody
 2017-07-05 16:13:21 +02:00
Fabian Reinartz ad86c389cb Merge pull request #2869 from Gouthamve/lblspc 
parser: Support spaces everywhere
 2017-07-05 16:10:17 +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
Goutham Veeramachaneni 0e78b7e7c8 parser: support spaces everywhere 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-05 15:52:21 +02:00
Fabian Reinartz 329992201e Merge pull request #2897 from Gouthamve/oob-metric 
Handle scrapes with OutOfBounds metrics better
 2017-07-05 15:47:14 +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
Goutham Veeramachaneni 643c5837a0 Stop metrics that are 10mins ahead from now 
Fixes #2893

Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
 2017-07-04 15:34:08 +02:00
Fabian Reinartz 496c060f98 Merge pull request #2896 from prometheus/filepath 
config: resolve file SD paths relative to config
 2017-07-04 11:59:30 +02:00
Fabian Reinartz 65b087bcc1 config: resolve file SD paths relative to config 2017-07-04 11:40:26 +02:00
Goutham Veeramachaneni 3069bd3996 Handle scrapes with OutOfBounds metrics better 
fixes #2894

Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
 2017-07-04 11:24:13 +02:00
Fabian Reinartz 426125298e vendor: update prometheus/tsdb 2017-07-03 14:41:02 +02:00
Fabian Reinartz 3845dfb715 Merge pull request #2875 from prometheus/savemetric 
Savemetric
 2017-07-03 09:26:16 +02:00
Fabian Reinartz 4b70318d11 Merge pull request #2874 from prometheus/memleak 
retrieval: fix memory leak in scrape cache
 2017-06-26 15:21:35 +02:00
Fabian Reinartz 9ea748e745 Don't reallocate label set if still known 
If the storage deprecates a ref, we have to re-insert with the full
label set. Typically that doesn't correlate with a new series being
created.
We can still use the allocated label set from before.
 2017-06-26 14:38:57 +02:00
Fabian Reinartz 2368d2c45b retrieval: fix memory leak in scrape cache 2017-06-26 00:24:54 +02:00
Fabian Reinartz ca2b68889b Merge branch 'master' into dev-2.0 2017-06-23 13:15:44 +02: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
Fabian Reinartz 5cd37fe36f Merge branch 'nolockfile' into dev-2.0 2017-06-23 11:38:08 +02:00
Fabian Reinartz cdfd9c829d Merge pull request #2870 from prometheus/fix-label-display-issue 
Fix display of before-relabeling labels
 2017-06-23 11:37:05 +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
Julius Volz 7be94d6643 Fix display of before-relabeling labels 2017-06-22 15:36:17 -04:00
Fabian Reinartz be32afd6df cmd/prometheus: add back tsdb.no-lockfile flag 2017-06-22 15:02:10 +02:00
Fabian Reinartz 70f96b0ffb *: cut v2.0.0-alpha.3 2017-06-22 12:02:51 +02:00
Fabian Reinartz e69dca6b9c Merge pull request #2868 from Gouthamve/kingpin-promtool 
Move promtool to kingpin
 2017-06-22 11:38:29 +02:00
Goutham Veeramachaneni f9202c6511
Move from .yaml to .yml in update rules 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-21 18:38:37 +05:30
Goutham Veeramachaneni e3701077c3
Move promtool to kingpin 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-21 17:42:57 +05:30
Fabian Reinartz 290c6b2383 Merge pull request #2866 from prometheus/kingpin 
Kingpin instead of Cobra
 2017-06-21 11:56:30 +02:00
Fabian Reinartz 867b8d108f cmd/prometheus: cleanup 2017-06-21 11:38:13 +02:00
Fabian Reinartz 34ab7a885a cmd/prometheus: switch to kingpin 2017-06-20 17:38:01 +02:00
Fabian Reinartz 8088600202 vendor: add kingpin, drop unused deps 2017-06-20 17:37:40 +02:00
Brian Brazil dd07f693c8 Single quotes are not valid label value delimiters. 2017-06-20 10:54:39 +01:00
Brian Brazil a6ca391e6e Reject scrapes with invalid utf-8 label values. 2017-06-20 10:54:39 +01:00
Alexey Palazhchenko 6a767b736b Parse custom step parameter correctly. (#2861) 
Fixes #2827.
 2017-06-19 17:22:59 +01:00
Fabian Reinartz ab1bc9bcdd Merge pull request #2842 from Gouthamve/rulegroups 
Rulegroups
 2017-06-19 13:27:37 +02:00
Goutham Veeramachaneni 592cb00c2f
Remove version from RuleGroups 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-19 16:38:46 +05:30
Goutham Veeramachaneni 37e7b69f56
Merge remote-tracking branch 'upstream/dev-2.0' into rulegroups 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-19 16:34:55 +05:30
Fabian Reinartz 98c2d8477a Merge pull request #2844 from Gouthamve/cobra 
Move CLI commander to cobra
 2017-06-19 11:59:52 +02:00
Goutham Veeramachaneni b2f7c8d842
Use user nobody in Dockerfile 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-19 15:03:39 +05:30