RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-28 09:42:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,947 Commits 243 Branches 444 Tags 653 MiB
25135c3691
Commit Graph

2947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Julius Volz
c0b430b8e5 Improve before-relabeling label tooltips. 
Yes, the label names and values really need double HTML escaping in
order to end up correctly in the tooltip after two levels of unescaping.

Fixes https://github.com/prometheus/prometheus/issues/1563
 2016-04-18 20:23:41 +02:00
Fabian Reinartz
f12ebd6635 Update changelog for 0.18.0 2016-04-18 09:45:18 +02:00
Fabian Reinartz
b489427ea4 Bump version to 0.18.0 2016-04-18 09:42:46 +02:00
Fabian Reinartz
64ed5d0cc7 Merge pull request #1561 from prometheus/fabxc/alerterr 
Add error message if old alert rule tokens are read
 2016-04-16 22:44:15 +02:00
Fabian Reinartz
fceedfa807 Add error message if old alert rule tokens are read 2016-04-16 22:25:51 +02:00
Brian Brazil
78e43ff758 Merge pull request #1560 from prometheus/fix-keep-common-printing 
Fix missing printed keep_common without grouping.
 2016-04-15 18:54:03 +01:00
Julius Volz
6ac39700ea Fix missing printed keep_common without grouping. 2016-04-15 19:48:17 +02:00
Björn Rabenstein
23d383a743 Merge pull request #1559 from prometheus/beorn7/storage 
Never drop a still open head chunk.
 2016-04-15 19:34:11 +02:00
beorn7
db16acd7fb Never drop a still open head chunk. 2016-04-15 19:18:40 +02:00
Björn Rabenstein
096a2ef200 Merge pull request #1555 from prometheus/beorn7/cd 
Checkpoint fingerprint mappings only upon shutdown
 2016-04-15 01:05:32 +02:00
beorn7
a90d645378 Checkpoint fingerprint mappings only upon shutdown 
Before, we checkpointed after every newly detected fingerprint
collision, which is not a problem as long as collisions are
rare. However, with a sufficient number of metrics or particular
nature of the data set, there might be a lot of collisions, all to be
detected upon the first set of scrapes, and then the checkpointing
after each detection will take a quite long time (it's O(n²),
essentially).

Since we are rebuilding the fingerprint mapping during crash recovery,
the previous, very conservative approach didn't even buy us
anything. We only ever read from the checkpoint file after a clean
shutdown, so the only time we need to write the checkpoint file is
during a clean shutdown.
 2016-04-15 01:03:28 +02:00
Fabian Reinartz
f6c29843fb Merge pull request #1552 from prometheus/link-to-documentation 
Add link to prometheus.io in the README
 2016-04-14 10:38:06 +02:00
Tobias Schmidt
92d5054c67 Add link to prometheus.io in the README 2016-04-13 22:23:33 -04:00
Julius Volz
4a372fdcfb Merge pull request #1554 from jonboulle/master 
Add missing Apache license headers + travis check
 2016-04-13 16:36:41 +02:00
Jonathan Boulle
096219d535 Add check_style to travis configuration 2016-04-13 16:09:52 +02:00
Jonathan Boulle
38098f8c95 Add missing license headers 
Prometheus is Apache 2 licensed, and most source files have the
appropriate copyright license header, but some were missing it without
apparent reason. Correct that by adding it.
 2016-04-13 16:08:22 +02:00
Jonathan Boulle
1c8262be12 Add script to check for missing license headers 
Also adds a `check_license` target to the Makefile to run the script
 2016-04-13 16:08:14 +02:00
Fabian Reinartz
322ad49b01 Merge branch 'release-0.18' 2016-04-09 12:56:13 +02:00
Fabian Reinartz
b9853cacba Add CHANGE on alerting rule syntax 2016-04-09 12:55:49 +02:00
Fabian Reinartz
a18639dc2d Merge pull request #1454 from prometheus/beorn7/fix-test 
Give TestEvictAndLoadChunkDescs more time to actually evict
 2016-04-08 14:58:01 +02:00
Fabian Reinartz
0520414000 Merge pull request #1535 from prometheus/fabxc/0.18.0rc1_changelog 
Add 0.18.0rc1 changelog
 2016-04-07 16:45:10 +02:00
Fabian Reinartz
6d1a756613 Add 0.18.0rc1 changelog 2016-04-07 16:42:33 +02:00
Fabian Reinartz
8ce4cfe858 Bump version to 0.18.0rc1 2016-04-07 15:43:09 +02:00
Seth Miller
79fe798e67 Add vendoring for Azure discovery 2016-04-06 22:48:01 -05:00
Seth Miller
0988e3b937 Add support for Azure discovery 
This change adds the ability to do target discovery with Microsoft's Azure platform.
 2016-04-06 22:47:02 -05:00
Brian Brazil
3683eaf205 Merge pull request #1534 from prometheus/fabxc/gover 
Include goversion in build_info metric
 2016-04-06 15:40:15 +01:00
Fabian Reinartz
f3e55cba1d Include goversion in build_info metric 2016-04-06 16:35:20 +02:00
Julius Volz
17079952c1 Merge pull request #1531 from prometheus/revert-1530-simplify-runtime-version 
Revert "Simplify runtime version code more"
 2016-04-06 12:08:09 +02:00
Fabian Reinartz
77f5b9d268 Revert "Simplify runtime version code more" 2016-04-06 08:39:51 +02:00
Julius Volz
cb690a2d23 Merge pull request #1530 from prometheus/simplify-runtime-version 
Simplify runtime version code more
 2016-04-06 00:54:20 +02:00
Julius Volz
17ece74511 Simplify runtime version code more 
It's no longer a build-time injected variable (as the comment above its
block indicates), so move it to the map below.
 2016-04-05 23:57:22 +02:00
Fabian Reinartz
2c19334715 Merge pull request #1529 from prometheus/fabxc/goversion 
Use runtime.Version()
 2016-04-05 23:23:32 +02:00
Fabian Reinartz
da701f9d13 Merge pull request #1527 from prometheus/fabxc/fixrace 
Fix potential race in ctx intialization
 2016-04-05 22:41:01 +02:00
Fabian Reinartz
9f5ae819e2 Use runtime.Version() 2016-04-05 22:38:49 +02:00
Fabian Reinartz
769389e559 Fix potential race in ctx intialization 2016-04-05 20:27:31 +02:00
Fabian Reinartz
9ee91062c4 Merge pull request #1522 from prometheus/unless-operator 
Implement relative complement set operator "unless"
 2016-04-04 21:36:17 +02:00