Commit Graph

2830 Commits (82a96167f6e6dfd4611cd758f38a24e86eb47a34)
 

Author SHA1 Message Date
Brian Brazil 82a96167f6 Merge pull request #1611 from shawnps/patch-1
9 years ago
Shawn Smith d7481f266e fix typo
9 years ago
Tobias Schmidt a32cab5992 Merge pull request #1598 from sdurrheimer/master
9 years ago
Steve Durrheimer 4ebf7970ce
Update README image shields
9 years ago
Fabian Reinartz ad1542cf95 ci: fix inconsistent indentation
9 years ago
Fabian Reinartz 26799411f6 Merge pull request #1609 from prometheus/fabxc-goversion
9 years ago
Fabian Reinartz d153dc3e82 *: bump default Go version to 1.6.2
9 years ago
Tobias Schmidt 3ce895e86d Merge pull request #1608 from prometheus/fix-printf
9 years ago
Julius Volz 97b018d26d Fix format argument in retrieval test.
9 years ago
Fabian Reinartz f94fc76608 Merge pull request #1592 from prometheus/fabxc-consul-ref
9 years ago
Fabian Reinartz 289f306dd9 Merge pull request #1590 from prometheus/fabxc-marathon-ref
9 years ago
Fabian Reinartz 76076bfb47 discovery: simplify client initialization
9 years ago
Fabian Reinartz b5bfb502df discovery: properly check context on chan send
9 years ago
Fabian Reinartz 9f8feb9ff6 discovery: consolidate Marathon SD files
9 years ago
Fabian Reinartz 086f7caceb discovery: extract Consul shouldWatch logic
9 years ago
Fabian Reinartz e805e68c01 discovery: sanitize Consul service discovery
9 years ago
Brian Brazil 04293424eb Merge pull request #1571 from prometheus/ignoring
9 years ago
Brian Brazil 68e70d992a Clarify error message around on(x) group_left(x)
9 years ago
Brian Brazil 7201c010c4 Rename On to MatchingLabels
9 years ago
Björn Rabenstein 95a7a58eb5 Merge pull request #1591 from prometheus/beorn7/logging
9 years ago
beorn7 07a294ac15 Doc comment fixes
9 years ago
beorn7 20cba1ed8f Initialize metric vectors in memorySeriesStorage
9 years ago
Fabian Reinartz 5837e6a97f discovery: move consul SD into own package
9 years ago
beorn7 d566808d40 Bring back logging of discarded samples
9 years ago
Julius Volz 25775b3583 Merge pull request #1588 from jhermann/patch-1
9 years ago
Jürgen Hermann b5c09310e5 Explicit link to full install docs added
9 years ago
Fabian Reinartz 490ff9fee8 Merge pull request #1580 from prometheus/fabxc/quay
9 years ago
Fabian Reinartz e15c35431b build: push to Dockerhub and Quay
9 years ago
Brian Brazil 816193f254 Merge pull request #1581 from prometheus/vendorup
9 years ago
Fabian Reinartz 838c74ee9f vendor: update govalidator
9 years ago
Fabian Reinartz 53fe5639bf Merge pull request #1576 from sdurrheimer/change-circleci-test-image
9 years ago
Steve Durrheimer 3c6432ae2a
Update CircleCI test docker image
9 years ago
Fabian Reinartz 9003ee441b Merge pull request #1577 from sdurrheimer/fix-git-branch-with-slash-as-docker-tag
9 years ago
Tobias Schmidt 0647926817 Merge pull request #1578 from prometheus/time-in-hoverdetail
9 years ago
Julius Volz c78bd13a2b Include date and time in graph hover detail.
9 years ago
Steve Durrheimer b2292aaa62 Fix git branch with slash as docker tag
9 years ago
Julius Volz bf0897bea5 Merge pull request #1575 from prometheus/fix-promu-path
9 years ago
Julius Volz 7735d0da63 Fix build for people without $GOPATH/bin in $PATH.
9 years ago
Brian Brazil d991f0cf47 For many-to-one matches, always copy label from one side.
9 years ago
Brian Brazil 768d09fd2a Change on+group_* to take copy from the one side.
9 years ago
Brian Brazil d1edfb25b3 Add support for OneToMany with IGNORING.
9 years ago
Brian Brazil 1d08c4fef0 Add 'ignoring' as modifier for binops.
9 years ago
Brian Brazil f5084ab1c5 Add tests for group_left/group_right
9 years ago
Fabian Reinartz b8b114a82a Merge pull request #1556 from sdurrheimer/master
9 years ago
Fabian Reinartz 585ab6b163 Merge pull request #1494 from iamseth/master
9 years ago
Steve Durrheimer 8688cf2579
New release process using docker, circleci and a centralized
9 years ago
Brian Brazil 261aba68f1 Merge pull request #1564 from prometheus/better-tooltips
9 years ago
Julius Volz c0b430b8e5 Improve before-relabeling label tooltips.
9 years ago
Fabian Reinartz f12ebd6635 Update changelog for 0.18.0
9 years ago
Fabian Reinartz b489427ea4 Bump version to 0.18.0
9 years ago