mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 06:59:40 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
4159 commits 243 branches 444 tags 649 MiB
Commit graph

4159 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 931f2705f2 Merge pull request #2942 from prometheus/fabxc-patch-1 
Fix command line flags in Dockerfile
 2017-07-13 12:53:56 +02:00
Fabian Reinartz 377a549fe6 Fix command line flags in Dockerfile 2017-07-13 12:14:49 +02:00
Fabian Reinartz 2b5d915953 Merge pull request #2937 from prometheus/cutbeta 
Cut 2.0.0-beta.0
 2017-07-12 14:18:41 +02:00
Fabian Reinartz 724505e53e *: cut v2.0.0-beta.0 2017-07-12 14:01:56 +02:00
Fabian Reinartz 6aee36ac3b vendor: update prometheus/tsdb 2017-07-12 14:01:56 +02:00
Fabian Reinartz 6861b3d03d Delete remote file 2017-07-12 13:51:40 +02:00
Fabian Reinartz dba7586671 Merge branch 'master' into dev-2.0 2017-07-11 17:22:14 +02:00
Fabian Reinartz 16464c3a33 Merge pull request #2910 from prometheus/adminapi 
Admin API
 2017-07-11 17:15:49 +02:00
Fabian Reinartz 32226e30f5 Guard reload and quit endpoints by flag 2017-07-11 14:25:07 +02:00
Matthias Rampke f0f2ec7854 Merge pull request #2927 from pafuent/fix-test-short-for-windows 
Fixing tests for Windows
 2017-07-10 16:11:00 +00:00
Fuente, Pablo Andres 9eb8c6e1d2 Renaming the config_notwin test to config_default 2017-07-10 11:08:16 -03:00
Fabian Reinartz 2067d4cfe2 Merge pull request #2925 from prometheus/fix-alert-labels 
Fix alert label display in /alerts UI
 2017-07-10 15:32:54 +02:00
Fabian Reinartz bff55bfa72 Merge pull request #2921 from tomwilkie/2920-test 
Add _test.go suffix to promql/bench.go, split test.go in to two.
 2017-07-10 12:00:58 +02:00
Fabian Reinartz 45ac064669 web: disable Amin APIs by default 2017-07-10 09:29:41 +02:00
Fabian Reinartz ccf9e62972 *: add admin grpc API 2017-07-10 09:14:14 +02:00
Fuente, Pablo Andres fe73de9452 Renaming config test file to fix build tags 
Renaming the name of a file of the config tests, in order to properly
use the Go build tags feature.
 2017-07-10 00:02:08 -03:00
Fuente, Pablo Andres 193dc47230 Fixing code style to adhere gofmt 2017-07-09 02:43:33 -03:00
Fuente, Pablo Andres 902fafb8e7 Fixing tests for Windows 
Fixing the config/config_test, the discovery/file/file_test and the
promql/promql_test tests for Windows. For most of the tests, the fix involved
correct handling of path separators. In the case of the promql tests, the
issue was related to the removal of the temporal directories used by the
storage. The issue is that the RemoveAll() call returns an error when it
tries to remove a directory which is not empty, which seems to be true due to
some kind of process that is still running after closing the storage. To fix
it I added some retries to the remove of the temporal directories.
Adding tags file from Universal Ctags to .gitignore
 2017-07-09 01:59:30 -03:00
Julius Volz 13006feb1e Fix alert label display in /alerts UI 2017-07-08 11:42:13 +02:00
Goutham Veeramachaneni e1fc9dc78d Move /rules to new format (#2901) 
Fixes #2891

Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
 2017-07-08 11:38:02 +02:00
Tom Wilkie 835eb8c653 Add _test.go suffix to promql/{bench.go, test.go} to prevent importing the testing package in a normal binary. 2017-07-07 15:52:44 +01:00
Fabian Reinartz b420412135 Merge pull request #2915 from Gouthamve/parse-fuz 
textparse: Add fuzzing and fix bug caught
 2017-07-07 13:15:55 +02:00
Goutham Veeramachaneni b7eddbcd98 textparse: Add fuzzing and fix bug caught 
See https://github.com/cznic/golex/issues/11 for info on the bug

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-07 11:12:17 +02:00
Fabian Reinartz 9c8be7575c Merge pull request #2906 from Gouthamve/error-ptr-match 
Convert tsdb.ErrOutOfBounds to a storage error
 2017-07-06 17:26:26 +02:00
Fabian Reinartz dc15a6f6ea vendor: add and update proto/grpc vendoring 2017-07-06 14:38:20 +02:00
Goutham Veeramachaneni 243419c007 Return tsdb.ErrOutOfBounds as storage.ErrOutOfBounds 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-06 14:18:31 +02:00
Fabian Reinartz be990c0287 Merge pull request #2907 from Gouthamve/log-tm 
Log the stopping of TargetManager in Info
 2017-07-06 12:00:11 +02:00
Goutham Veeramachaneni a607873ad2 Log the stopping of TargetManager in Info 
Fixes #2715

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-06 11:44:07 +02:00
Fabian Reinartz 8a2850b5e1 vendor: add missing app engine dependencies 2017-07-05 16:39:50 +02:00
Fabian Reinartz e58e7954a7 Merge pull request #2904 from Gouthamve/srclbl-omitempty 
Make sure rendering config produces valid config
 2017-07-05 16:24:18 +02:00
Fabian Reinartz 24e9deac71 Merge pull request #2859 from Gouthamve/docker-nobody 
Dockerfile: Run as nobody
 2017-07-05 16:13:21 +02:00
Fabian Reinartz ad86c389cb Merge pull request #2869 from Gouthamve/lblspc 
parser: Support spaces everywhere
 2017-07-05 16:10:17 +02:00
Goutham Veeramachaneni 98d20d5880 Make sure rendering config produces valid config 
Fixes #2899

Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
 2017-07-05 16:09:29 +02:00
Goutham Veeramachaneni 0e78b7e7c8 parser: support spaces everywhere 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-05 15:52:21 +02:00
Fabian Reinartz 329992201e Merge pull request #2897 from Gouthamve/oob-metric 
Handle scrapes with OutOfBounds metrics better
 2017-07-05 15:47:14 +02:00
Fabian Reinartz 3ed4fea58c Merge pull request #2902 from mattbostock/patch-2 
Remote queue manager: Fix typo
 2017-07-05 11:57:52 +02:00
Matt Bostock 13c6e4a4bc Remote queue manager: Fix typo 
Change 'send' to 'sent'.
 2017-07-04 20:48:52 +01:00
Alin Sinpalean 38de290d5f Console graph color scheme support (#2900) 
Add a colorScheme parameter to PromConsole.Graph, to allow using custom colors in console graphs.
 2017-07-04 15:30:12 +01:00
Goutham Veeramachaneni 643c5837a0 Stop metrics that are 10mins ahead from now 
Fixes #2893

Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
 2017-07-04 15:34:08 +02:00
Fabian Reinartz 496c060f98 Merge pull request #2896 from prometheus/filepath 
config: resolve file SD paths relative to config
 2017-07-04 11:59:30 +02:00
Fabian Reinartz 65b087bcc1 config: resolve file SD paths relative to config 2017-07-04 11:40:26 +02:00
Goutham Veeramachaneni 3069bd3996 Handle scrapes with OutOfBounds metrics better 
fixes #2894

Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
 2017-07-04 11:24:13 +02:00
Fabian Reinartz 426125298e vendor: update prometheus/tsdb 2017-07-03 14:41:02 +02:00
Fabian Reinartz 3845dfb715 Merge pull request #2875 from prometheus/savemetric 
Savemetric
 2017-07-03 09:26:16 +02:00
Fabian Reinartz 4b70318d11 Merge pull request #2874 from prometheus/memleak 
retrieval: fix memory leak in scrape cache
 2017-06-26 15:21:35 +02:00
Fabian Reinartz 9ea748e745 Don't reallocate label set if still known 
If the storage deprecates a ref, we have to re-insert with the full
label set. Typically that doesn't correlate with a new series being
created.
We can still use the allocated label set from before.
 2017-06-26 14:38:57 +02:00
Fabian Reinartz 2368d2c45b retrieval: fix memory leak in scrape cache 2017-06-26 00:24:54 +02:00
Fabian Reinartz ca2b68889b Merge branch 'master' into dev-2.0 2017-06-23 13:15:44 +02:00
Tobias Schmidt 43075d0215 Merge pull request #2865 from mattbostock/add_marathon_port_ordinal_label 
Marathon SD: Set port index label
 2017-06-23 12:57:09 +02:00
Fabian Reinartz 5cd37fe36f Merge branch 'nolockfile' into dev-2.0 2017-06-23 11:38:08 +02:00