mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-10-01 13:17:32 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
7546 commits 215 branches 425 tags 751 MiB
Commit graph

7546 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 8d3a398113 Merge pull request #109 from prometheus/fixes 
Fix compactions
 2017-07-14 13:45:46 +02:00
Fabian Reinartz 74f67e8271 Fix compacting disable/enable 
Enabling and disabling compaction no longer blocks are potentially
causes panics.
 2017-07-14 10:08:05 +02:00
Fabian Reinartz 3065be97d8 Fix and document locking order for DB 2017-07-14 09:00:22 +02:00
Fabian Reinartz 47afc8e00f Reduce test timeout on Travis 2017-07-14 08:00:18 +02:00
Tom Wilkie a09acdcc5b Make concreteSeriersIterator behave. 2017-07-13 18:33:08 +01:00
Goutham Veeramachaneni 4194d2ac79 Call At() only if Next() is true 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-13 18:42:45 +02:00
Fabian Reinartz 9c4235532e Fix compaction selection after creating new heads 
This fixes the case where between block creations no compaction
plans are ran. We were not compacting anything in these
cases since the on creation the most recent head block always had
a high timestamp of 0.
 2017-07-13 16:15:13 +02:00
Fabian Reinartz 5d7b5994d6 Fix compaction range selection 2017-07-13 16:13:59 +02:00
Tom Wilkie 994a7f27d6 Propagate errors through mergeSeriesSet correctly. 2017-07-13 15:02:01 +01:00
Tom Wilkie 2e0d8487e3 Return zeros if At() is called after Next() returns false. 2017-07-13 14:40:29 +01:00
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
Tom Wilkie 014bd31a86 Remove unnecessary whitespace changes, add comment. 2017-07-13 11:26:46 +01:00
Fabian Reinartz 377a549fe6 Fix command line flags in Dockerfile 2017-07-13 12:14:49 +02:00
Tom Wilkie 98ac07f86a Add unit test for the merging on the read path. 2017-07-13 11:05:38 +01:00
Tom Wilkie 2ac1809a5b Get label set from cache in addReportSample. 2017-07-12 22:09:16 +01:00
Tom Wilkie b568ace7ce Move protos to ./prompb 2017-07-12 22:06:35 +01:00
Goutham Veeramachaneni 3c22488157 Merge pull request #108 from Gouthamve/compact-large-dels-2 
Recompact blocks with large number of tombstones
 2017-07-12 18:54:01 +02:00
Goutham Veeramachaneni 401bdfd4a6 Make Chunks return the number of samples inside 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-12 18:45:12 +02:00
Goutham Veeramachaneni 1263a68875 Recompact blocks with large number of tombstones 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-12 18:27:31 +02:00
Goutham Veeramachaneni 7b9c536883 Merge pull request #103 from Gouthamve/block-ranges 
Compaction implementation for block-ranges
 2017-07-12 17:32:49 +02:00
Goutham Veeramachaneni 9a2ab732b5 Choose ranges by retention and min-block-duration 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-12 17:30:34 +02:00
Tom Wilkie 240feb313b Don't regenerate label set for cached values. 2017-07-12 15:54:38 +01:00
Tom Wilkie 96e25adc8d Introduce 'primary' storage in fanout, and have Add return the ref from the primary. 
Also, ensure all append batches are rolled back when a commit or rollback fails.
 2017-07-12 15:51:05 +01:00
Tom Wilkie db8128ceeb Add label set as first parameter to AddFast, ingored by TSDB adapter. 2017-07-12 15:20:12 +01: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
Goutham Veeramachaneni 969c407335 Merge pull request #106 from Gouthamve/snapshot-time 
Persist the right MaxTime when snapshotting
 2017-07-12 13:54:31 +02:00
Fabian Reinartz 6861b3d03d Delete remote file 2017-07-12 13:51:40 +02:00
Goutham Veeramachaneni f1ae239c20 Persist the right MaxTime when snapshotting 
This is because we cut a new block from where the snapshotted block ends
if we restore from backups and highTimestamp would be where we should be
 starting from.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-12 13:48:13 +02:00
Tom Wilkie 2dda5775e3 Initial port of remote storage to v2. 2017-07-12 12:27:57 +01:00
Martín Ferrari bb13a23d29 Merge pull request #2934 from TheTincho/fix-migrated-url-redirect 
Add PATH_PREFIX to redirectToMigratedURL
 2017-07-11 20:31:22 +01:00
Martín Ferrari 64cfe2e7f5 Add PATH_PREFIX to redirectToMigratedURL 
Old grafana versions use this format, and it breaks with prometheus instances
not mounted in the root directory.
 2017-07-11 17:36:17 +00: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
Alexey Palazhchenko b6f89a1982 Parse custom step parameter correctly. (#2928) 
Backport of 6a767b736b.
Refs #2827, #2861.
 2017-07-10 21:05:40 +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
Goutham Veeramachaneni ce23adb579 Initial compaction implementation for block-ranges 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-07-07 16:32:18 +02:00