mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 22:19:40 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
2833 commits 243 branches 444 tags 649 MiB
Commit graph

2833 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steve Durrheimer d00e8f114d
Fallback to default promu's crossbuild platforms list 2016-05-05 13:55:14 +02:00
Steve Durrheimer a2b913f018
Change the test docker image tag to match promu golang version 2016-05-05 13:48:00 +02:00
Steve Durrheimer b07768f613
Fix CircleCI problems during go get promu 2016-05-05 13:47:51 +02:00
Brian Brazil 82a96167f6 Merge pull request #1611 from shawnps/patch-1 
fix typo
 2016-05-04 05:45:57 +01:00
Shawn Smith d7481f266e fix typo 2016-05-04 13:42:27 +09:00
Tobias Schmidt a32cab5992 Merge pull request #1598 from sdurrheimer/master 
Update README image shields
 2016-05-03 18:14:07 -04:00
Steve Durrheimer 4ebf7970ce
Update README image shields 2016-05-04 00:01:05 +02:00
Fabian Reinartz ad1542cf95 ci: fix inconsistent indentation 2016-05-02 14:53:20 +02:00
Fabian Reinartz 26799411f6 Merge pull request #1609 from prometheus/fabxc-goversion 
*: bump default Go version to 1.6.2
 2016-05-02 13:10:01 +02:00
Fabian Reinartz d153dc3e82 *: bump default Go version to 1.6.2 2016-05-02 12:15:41 +02:00
Tobias Schmidt 3ce895e86d Merge pull request #1608 from prometheus/fix-printf 
Fix format argument in retrieval test.
 2016-05-01 17:44:16 -04:00
Julius Volz 97b018d26d Fix format argument in retrieval test. 2016-05-01 23:37:45 +02:00
Fabian Reinartz f94fc76608 Merge pull request #1592 from prometheus/fabxc-consul-ref 
discovery: sanitize Consul service discovery
 2016-04-30 21:18:33 +02:00
Fabian Reinartz 289f306dd9 Merge pull request #1590 from prometheus/fabxc-marathon-ref 
Fix basic issues in marathon SD
 2016-04-30 21:17:22 +02:00
Fabian Reinartz 76076bfb47 discovery: simplify client initialization 2016-04-30 21:07:49 +02:00
Fabian Reinartz b5bfb502df discovery: properly check context on chan send 2016-04-30 11:57:20 +02:00
Fabian Reinartz 9f8feb9ff6 discovery: consolidate Marathon SD files 2016-04-30 11:56:11 +02:00
Fabian Reinartz 086f7caceb discovery: extract Consul shouldWatch logic 2016-04-30 11:50:19 +02:00
Fabian Reinartz e805e68c01 discovery: sanitize Consul service discovery 
This commits simplifies the SD's structure and ensures that all
channel sends are checked against a canceled context.
 2016-04-30 11:50:19 +02:00
Brian Brazil 04293424eb Merge pull request #1571 from prometheus/ignoring 
Fix for #1503
 2016-04-26 16:02:12 +01:00
Brian Brazil 68e70d992a Clarify error message around on(x) group_left(x) 2016-04-26 14:31:00 +01:00
Brian Brazil 7201c010c4 Rename On to MatchingLabels 2016-04-26 14:28:36 +01:00
Björn Rabenstein 95a7a58eb5 Merge pull request #1591 from prometheus/beorn7/logging 
Bring back logging of discarded samples
 2016-04-26 01:47:24 +02:00
beorn7 07a294ac15 Doc comment fixes 2016-04-26 01:05:56 +02:00
beorn7 20cba1ed8f Initialize metric vectors in memorySeriesStorage 2016-04-25 17:08:07 +02:00
Fabian Reinartz 5837e6a97f discovery: move consul SD into own package 2016-04-25 16:56:27 +02:00
beorn7 d566808d40 Bring back logging of discarded samples 
But only on DEBUG level.

Also, count and report the two cases of out-of-order timestamps on the
one hand and same timestamp but different value on the other hand
separately.
 2016-04-25 16:43:52 +02:00
Julius Volz 25775b3583 Merge pull request #1588 from jhermann/patch-1 
Explicit link to full install docs added
 2016-04-25 12:20:28 +02:00
Jürgen Hermann b5c09310e5 Explicit link to full install docs added 2016-04-25 11:31:38 +02:00
Fabian Reinartz 490ff9fee8 Merge pull request #1580 from prometheus/fabxc/quay 
build: push to Dockerhub and Quay
 2016-04-24 13:16:43 +02:00
Fabian Reinartz e15c35431b build: push to Dockerhub and Quay 2016-04-24 12:16:53 +02:00
Brian Brazil 816193f254 Merge pull request #1581 from prometheus/vendorup 
vendor: update govalidator
 2016-04-24 09:56:30 +01:00
Fabian Reinartz 838c74ee9f vendor: update govalidator 2016-04-24 10:13:39 +02:00
Fabian Reinartz 53fe5639bf Merge pull request #1576 from sdurrheimer/change-circleci-test-image 
Update CircleCI test docker image
 2016-04-24 09:56:02 +02:00
Steve Durrheimer 3c6432ae2a
Update CircleCI test docker image 2016-04-23 15:17:28 +02:00
Fabian Reinartz 9003ee441b Merge pull request #1577 from sdurrheimer/fix-git-branch-with-slash-as-docker-tag 
Fix git branch with slash as docker tag
 2016-04-23 15:14:46 +02:00
Tobias Schmidt 0647926817 Merge pull request #1578 from prometheus/time-in-hoverdetail 
Include date and time in graph hover detail.
 2016-04-22 17:10:00 -04:00
Julius Volz c78bd13a2b Include date and time in graph hover detail. 
This is the same solution as applied to PromDash in
https://github.com/prometheus/promdash/pull/72.

Fixes https://github.com/prometheus/prometheus/issues/1569
 2016-04-22 23:00:18 +02:00
Steve Durrheimer b2292aaa62 Fix git branch with slash as docker tag 2016-04-22 21:47:55 +02:00
Julius Volz bf0897bea5 Merge pull request #1575 from prometheus/fix-promu-path 
Fix build for people without $GOPATH/bin in $PATH.
 2016-04-22 18:33:37 +02:00
Julius Volz 7735d0da63 Fix build for people without $GOPATH/bin in $PATH. 2016-04-22 18:16:00 +02:00
Brian Brazil d991f0cf47 For many-to-one matches, always copy label from one side. 
This is a breaking change for everyone using the machine roles
labeling approach.
 2016-04-21 19:35:41 +01:00
Brian Brazil 768d09fd2a Change on+group_* to take copy from the one side. 
If the label doesn't exist on the one side, it's not copied.

All labels on the many inside are included, this is a breaking change
but likely low impact.
 2016-04-21 19:35:40 +01:00
Brian Brazil d1edfb25b3 Add support for OneToMany with IGNORING. 
The labels listed in the group_ modifier will be copied from the one
side to the many side. It will be valid to specify no labels.

This is intended to replace the existing ON/GROUP_* support.,
 2016-04-21 19:35:35 +01:00
Brian Brazil 1d08c4fef0 Add 'ignoring' as modifier for binops. 
Where 'on' uses the given labels to match,
'ignoring' uses all other labels to match.

group_left/right is not supported yet.
 2016-04-21 19:34:29 +01:00
Brian Brazil f5084ab1c5 Add tests for group_left/group_right 2016-04-21 16:52:53 +01:00
Fabian Reinartz b8b114a82a Merge pull request #1556 from sdurrheimer/master 
[WIP] New release process using docker, circleci and a centralized building tool
 2016-04-21 16:38:32 +02:00
Fabian Reinartz 585ab6b163 Merge pull request #1494 from iamseth/master 
Add discovery capability for Microsoft Azure
 2016-04-21 13:49:44 +02:00
Steve Durrheimer 8688cf2579
New release process using docker, circleci and a centralized 
building tool
 2016-04-18 22:41:04 +02:00
Brian Brazil 261aba68f1 Merge pull request #1564 from prometheus/better-tooltips 
Improve before-relabeling label tooltips.
 2016-04-18 19:33:54 +01:00