mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-14 01:24:04 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
4411 commits 247 branches 438 tags 656 MiB
Commit graph

4411 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Goutham Veeramachaneni 67dc73fd59
Flag changes for 2.0 
Fixes: prometheus/prometheus#2087

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 20:21:41 +05:30
Goutham Veeramachaneni d407bd150c Consolidate the duration params in CLI 
* All CLI params moved to model.Duration

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 20:20:57 +05:30
Goutham Veeramachaneni f40a5990a0
vendor: Update common/model 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 20:20:44 +05:30
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
Goutham Veeramachaneni c472316fb3
Check done before every rule evaluation. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 16:57:22 +05:30
Goutham Veeramachaneni 6b70a4d850
Incorporate PR feedback 
* Move fingerprint to Hash()
* Move away from tsdb.MultiError
* 0777 -> 0666 for files
* checkOverflow of extra fields

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 16:44:33 +05:30
Goutham Veeramachaneni 771e5a5d1d
vendor: gh/Sirupsen/logrus -> gh/sirupsen/logrus 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 16:04:33 +05:30
Goutham Veeramachaneni 6c1617fd13
Simplify usage string 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 15:55:13 +05:30
Goutham Veeramachaneni 507790a357
Rework logging to use explicitly passed logger 
Mostly cleaned up the global logger use. Still some uses in discovery
package.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 15:52:44 +05:30
Goutham Veeramachaneni c399563ec1
vendor: Update common/log 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 15:49:41 +05:30
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
Goutham Veeramachaneni dc69645e92
Move back to go-yaml 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 10:46:21 +05:30
Goutham Veeramachaneni ea255c6520
vendor: Add win specific dependency 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-15 17:02:37 +05:30
Goutham Veeramachaneni 8abb91f656
Move CLI commander to cobra 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-15 16:38:08 +05:30
Goutham Veeramachaneni cbeeaf48aa
vendor: Add cobra and pflag 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-15 16:36:36 +05:30
Fabian Reinartz dfef6cf234 Merge pull request #2843 from prometheus/fix-scrape-err-reporting 
retrieval: Fix "up" reporting for failed scrapes
 2017-06-15 11:03:13 +02:00
Julius Volz 6f66125809 retrieval: Fix "up" reporting for failed scrapes 2017-06-14 22:22:12 -04:00
Goutham Veeramachaneni 5ff283a7b7
Reflect the grouping in the UI 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 16:09:14 +05:30
Goutham Veeramachaneni 8cca666cf2
Add file name to group. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 15:18:39 +05:30
Goutham Veeramachaneni e893c89333
Validate labels and annotations 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 15:07:54 +05:30
Goutham Veeramachaneni c884881f7d
Add License Header 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 13:34:13 +05:30
Goutham Veeramachaneni 1c08743721
Update check-rules to new format. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 13:32:26 +05:30
Goutham Veeramachaneni 2d1e92513b
Add tests 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 13:21:32 +05:30
Goutham Veeramachaneni a48a018368
Make sure groups are unique in a single file 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 12:19:21 +05:30
Goutham Veeramachaneni cea1e99f78
Add update-rules command to promtool 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 11:38:54 +05:30
Fabian Reinartz 7640960469 vendor: update tsdb (#2840) 2017-06-13 07:44:07 +02:00
Goutham Veeramachaneni baf5b0f0fc Fix error where we look into the future. (#2829) 
* Fix error where we look into the future.

So currently we are adding values that are in the future for an older
timestamp. For example, if we have [(1, 1), (150, 2)] we will end up
showing [(1, 1), (2,2)].

Further it is not advisable to call .At() after Next() returns false.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Retuen early if done

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Handle Seek() where we reach the end of iterator

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Simplify code

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-13 07:22:27 +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