mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-30 07:59:40 -08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity
2910 commits 242 branches 446 tags 652 MiB
Commit graph

2910 commits

This branch
This branch
All branches
Author SHA1 Message Date
rohit01 47dd5f74ba discovery/marathon: #1722 - ignore apps with zero ports 2016-06-14 04:44:00 +05:30
Fabian Reinartz 23ca13c2fb Merge pull request #1688 from prometheus/beorn7/0.19 
Cut 0.19.2
 2016-05-29 10:41:00 -07:00
beorn7 592f02925e Cut 0.19.2 
Note that this will be merged into the release-0.19 branch and only
includes bug fixes, not other recent commits.

This is low-risk and contains critical bug fixes and should therefore
be released ASAP.
 2016-05-29 18:44:40 +02:00
Björn Rabenstein 3113c0d719 Merge pull request #1685 from prometheus/beorn7/fix-group 
Correctly stringify GROUP_x modifiers without labels
 2016-05-29 18:34:58 +02:00
beorn7 5408666387 Correctly stringify GROUP_x modifiers without labels 
Since rule evaluations work via String(), this fixes evaluation of
rules containing GROUP_x modifiers without labels. This change is the
minimal bugfix (so that we can release a fixed version without
risk). It does not intend to implement any additional features (like
allowing `GROUP_LEFT()` or `ON()` or even `ON` - see discussion in
https://github.com/prometheus/prometheus/issues/1597 ).
 2016-05-28 20:15:02 +02:00
Roman Vynar 9d616952b3
Added missed pathPrefix to Status sub-menus 2016-05-26 17:42:28 +03:00
Fabian Reinartz 0b6e5eb7dd Merge branch 'release-0.19' 2016-05-25 17:40:42 -07:00
Fabian Reinartz 500a494c9c *: add 0.19.1 changelog 2016-05-25 17:33:01 -07:00
Fabian Reinartz 8074281180 *: bump version to 0.19.1 2016-05-25 17:33:01 -07:00
Fabian Reinartz 4e087165aa retrieval: handle nil target groups from updates 2016-05-25 17:33:01 -07:00
Fabian Reinartz 8fe8ccce63 retrieval: document panic behavior 2016-05-25 17:33:01 -07:00
Fabian Reinartz 021ef27fe3 retrieval: don't panic on non-HTTP scheme 2016-05-25 17:33:01 -07:00
beorn7 9a506fae47 Remove a spurious "w" from _base.html 2016-05-25 17:33:00 -07:00
Fabian Reinartz 810e0e254b Fix typo 2016-05-25 17:33:00 -07:00
Fabian Reinartz ec3aa12163 Fix indentation 2016-05-25 17:31:22 -07:00
Fabian Reinartz b26f4c0537 *: add 0.19.0 changelog 2016-05-25 17:31:22 -07:00
Fabian Reinartz a3f5ab0b72 *: bump version to 0.19.0 2016-05-25 17:31:22 -07:00
Pieter Lange ed0008b435 Minor typo 2016-05-25 17:31:22 -07:00
Bjoern Rabenstein c01d2924a2 Make assets without debug settings 2016-05-25 17:31:21 -07:00
Fabian Reinartz 74c448386c Merge pull request #1665 from prometheus/fabxc-retrpanic 
Fix kubernetes SD crash
 2016-05-25 17:13:27 -07:00
Fabian Reinartz 12b03db373 retrieval: handle nil target groups from updates 2016-05-25 16:59:16 -07:00
Brian Brazil e222e17073 Merge pull request #1664 from prometheus/fabxc-scheme-panic 
retrieval: don't panic on non-HTTP scheme
 2016-05-26 00:19:04 +01:00
Fabian Reinartz ea36efbbd1 retrieval: document panic behavior 2016-05-25 16:17:25 -07:00
Fabian Reinartz a5ba166935 retrieval: don't panic on non-HTTP scheme 2016-05-25 16:05:20 -07:00
Brian Brazil 7c237eee0e Merge pull request #1661 from prometheus/beorn7/ui 
Remove a spurious "w" from `_base.html`
 2016-05-25 13:10:06 +01:00
beorn7 93460fb853 Remove a spurious "w" from _base.html 2016-05-25 13:59:50 +02:00
Fabian Reinartz e1848445f4 Fix typo 2016-05-24 15:11:46 -07:00
Fabian Reinartz c4c2756a39 Fix indentation 2016-05-24 14:50:10 -07:00
Fabian Reinartz 58a7f5b089 Merge pull request #1655 from prometheus/release-0.19 
Release 0.19
 2016-05-24 14:20:59 -07:00
Fabian Reinartz 604d7114df *: add 0.19.0 changelog 2016-05-24 14:04:58 -07:00
Fabian Reinartz 0d466e76cc *: bump version to 0.19.0 2016-05-24 13:34:48 -07:00
Brian Brazil 642eb59f87 Merge pull request #1652 from pieterlange/patch-1 
Minor typo
 2016-05-24 10:27:46 +01:00
Pieter Lange 427b322078 Minor typo 2016-05-24 11:12:42 +02:00
Brian Brazil afc95820b1 Merge pull request #1650 from prometheus/beorn7/ui 
Make assets without debug settings
 2016-05-23 10:22:17 +01:00
Bjoern Rabenstein 52a133d4d2 Make assets without debug settings 2016-05-23 11:13:08 +02:00
Tobias Schmidt b713ca56c2 Merge pull request #1649 from prometheus/grobie/fix-kubernetes-discovery 
Fix type usage in Kubernetes discovery
 2016-05-20 12:35:43 -04:00
Tobias Schmidt 0c6ed9d437 Fix type usage in Kubernetes discovery 
The event types have been recently changed to be exported types which
wasn't reflected in the new pod discovery.
 2016-05-20 11:03:19 -04:00
Tobias Schmidt 4c439b4b45 Merge pull request #1646 from prometheus/beorn7/valuecomparison 
Correctly identify no-op appends if the value is NaN
 2016-05-20 10:38:05 -04:00
Fabian Reinartz f7ed2ff706 Merge pull request #1644 from prometheus/beorn7/logging 
Add missing logging of out-of-order samples
 2016-05-20 05:52:00 -07:00
Fabian Reinartz dec56838fc Merge pull request #1449 from pdbogen/master 
k8s pod discovery
 2016-05-20 05:45:09 -07:00
Björn Rabenstein 95ef7b14a7 Merge pull request #1645 from prometheus/beorn7/style 
Fix same style issues
 2016-05-20 13:51:10 +02:00
beorn7 a308c76292 Improve TestAppendOutOfOrder 
It did not test the returned error so far.
Also, add tests for the NaN case broken before
https://github.com/prometheus/common/pull/40
 2016-05-20 13:46:33 +02:00
beorn7 8032763db1 Update vendoring of github.com/prometheus/common/... 2016-05-20 13:44:37 +02:00
Brian Brazil 0c567b9554 Merge pull request #1643 from pydima/master 
storage/remote: Spawn not more than "maxConcurrentSends" goroutines.
 2016-05-20 10:28:28 +01:00
Patrick Bogen 89940eb48d Write tests to include testing determinancy of various slice orders; ensure that container order is deterministic 2016-05-19 10:57:23 -07:00
Patrick Bogen b3350d872a Add one label named for each port name, mapping it to port number; add corresponding tests; prefix port list label with a comma 2016-05-19 10:37:11 -07:00
beorn7 b2ef4dc52d Correctly identify no-op appends if the value is NaN 
This requires an updating of the vendored commen.model package, which
I will do once https://github.com/prometheus/common/pull/40 is merged.
 2016-05-19 18:32:47 +02:00
beorn7 d43c0159aa Fix style issues in retrieval/... 2016-05-19 17:14:04 +02:00
beorn7 b95c096a45 Fix style issues in rules/... 2016-05-19 16:59:53 +02:00
beorn7 45e5775f9b Add missing logging of out-of-order samples 
So far, out-of-order samples during rule evaluation were not logged,
and neither scrape health samples. The latter are unlikely to cause
any errors. That's why I'm logging them always now. (It's alway highly
irregular should it happen.) For rules, I have used the same plumbing
as for samples, just with a different wording in the message to mark
them as a result of rule evaluation.
 2016-05-19 16:22:53 +02:00