mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-19 03:54:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
7062 commits 249 branches 440 tags 660 MiB
Commit graph

7062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz b07a87768a Merge pull request #67 from prometheus/remove-skiplist 
Remove unused skiplist types
 2017-04-28 16:06:01 +02:00
Julius Volz 006f5d6b22 Merge pull request #68 from prometheus/simplify-equals 
Simplify Labels.Equals()
 2017-04-28 09:05:35 -05:00
Fabian Reinartz b098c36d27 Merge pull request #69 from prometheus/fix-finalize-tail-errhandling 
Add missing error handling for finalizeTail() call
 2017-04-28 16:05:19 +02:00
Julius Volz a25f874ec4 Simplify Labels.Equals() 
Also extend the Compare() tests to also test Labels.Equals().
 2017-04-28 16:01:37 +02:00
Julius Volz 9a3d857d8b Add missing error handling for finalizeTail() call 2017-04-28 15:59:23 +02:00
Julius Volz e374db22bc Remove unused skiplist types 2017-04-28 15:57:01 +02:00
Julius Volz 94f1ac599e Fix closing of meta file if meta encoding failed 2017-04-28 15:45:30 +02:00
Julius Volz 8d1fb4fa01 Minor comment fixes and additions. 2017-04-28 15:41:42 +02:00
Fabian Reinartz 54a7b98cff Fix and test ref handling in DB appender 2017-04-28 15:24:28 +02:00
Fabian Reinartz 8c483e27d3 Merge pull request #2661 from prometheus/texts 
pkg/textparse: implement timestamp parsing
 2017-04-27 17:49:57 +02:00
Fabian Reinartz 1df03d8346 make: disable remote tests temporarily 2017-04-27 17:27:19 +02:00
Fabian Reinartz 377886b371 pkg/textparse: implement timestamp parsing 2017-04-27 17:02:07 +02:00
Conor Broderick 314b81062d Updated vendoring for log level reporting issue (#2660) 2017-04-27 14:25:13 +01:00
Brian Akins 27d66628a1 Allow limiting Kubernetes service discover to certain namespaces 
Allow namespace discovery to be more easily extended in the future by using a struct rather than just a list.

Rename fields for kubernetes namespace discovery
 2017-04-27 07:41:36 -04:00
Fabian Reinartz e829dbe2be retrieval: comment out accept header again 2017-04-27 11:46:08 +02:00
Fabian Reinartz 0f3110487d Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0 2017-04-27 10:25:04 +02:00
Fabian Reinartz 37deb21c45 vendor: remove unused dependency and last ref to fabxc/tsdb 2017-04-27 10:23:34 +02:00
Fabian Reinartz 73b8ff0ddc Merge branch 'master' into dev-2.0 2017-04-27 10:19:55 +02:00
Julius Volz fe11c5933a Fix mutation of active alert elements by notifier (#2656) 
This caused the external label application in the notifier to bleed back
into the rule manager's active alerting elements.
 2017-04-26 10:29:42 -05:00
Fabian Reinartz 5248118b10 Merge pull request #2654 from dsymonds/master 
Add maintainers' GitHub usernames to MAINTAINERS.md.
 2017-04-25 08:43:36 +02:00
David Symonds 8bb07490a2 Add maintainers' GitHub usernames to MAINTAINERS.md. 
CONTRIBUTING.md instructs people to loop them in using that mechanism,
but nothing lists the right username.
 2017-04-25 16:32:23 +10:00
Fabian Reinartz 60d9138b6b Merge pull request #2653 from dsymonds/master 
Preserve Alertmanager URLs as *url.URL.
 2017-04-25 08:27:31 +02:00
David Symonds 04ad889751 Preserve Alertmanager URLs as *url.URL. 
Render a nicer link in the web UI.
 2017-04-25 16:17:46 +10:00
Tomasz Elendt d7ad9d2679 Fix various postings implementations 
* newIntersectPostings and newMergePostings should not advance passed
  postings automatically.
* listPostings and bigEndianPostings should not panic with index out
  of range when At() is called before Next()/Seek().
* Seek() call should advance listPostings/bigEndianPostings.
 2017-04-24 23:07:06 +02:00
Conor Broderick 9eb1a5d6bf Handle invalid query in graph UI (#2652) 2017-04-24 10:50:57 +01:00
Fabian Reinartz a5322c50fc Merge pull request #36 from Gouthamve/tests 
Tests For Querier and Postings
 2017-04-24 10:50:59 +02:00
Goutham Veeramachaneni 6178de9acc
Removed unused feild 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-04-22 01:43:18 +05:30
Goutham Veeramachaneni 725b69caa1
Incorporate feedback on #36 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-04-22 01:38:26 +05:30
Fabian Reinartz dc0fb2b585 Merge pull request #54 from prometheus/query-test 
Test we get back out the data we put in.
 2017-04-21 15:15:55 +02:00
Brian Brazil 2742fc380b Test we get back out the data we put in. 
This also adds a utility that'll aid future tests.
 2017-04-21 14:10:14 +01:00
Fabian Reinartz 2fcdd1a5cb Merge pull request #53 from prometheus/atomicity 
Remove dead code.
 2017-04-20 16:41:32 +02:00
Brian Brazil 0e1f72dca6 Merge pull request #55 from prometheus/branch-hack 
Hack to workaround dependency on non-master code.
 2017-04-20 15:18:09 +01:00
Brian Brazil 1d83746cc5 Hack to workaround dependency on non-master code. 2017-04-20 14:47:08 +01:00
Brian Brazil 72443bddfc Remove dead code. 2017-04-20 13:45:07 +01:00
Brian Brazil 8b8ba26129 Merge pull request #2644 from prometheus/release-1.6 
Merge 1.6.1 release from 1.6 branch
 2017-04-19 15:22:24 +01:00
Brian Brazil 8097a3c523 Cut v1.6.1 (#2640) 2017-04-19 14:23:56 +01:00
Fabian Reinartz 6a947878eb Merge pull request #2643 from prometheus/ci-2.0 
Add license to files.
 2017-04-19 14:50:20 +02:00
Brian Brazil 5c9a6ce747 Add license to files. 
This should fix CI for dev-2.0.
 2017-04-19 13:46:22 +01:00
Brian Brazil d04bd947ea Merge pull request #51 from prometheus/rollback 
Make rollback actually rollback.
 2017-04-19 11:29:03 +01:00
Brian Brazil dba222b53c Make rollback actually rollback. 
Also add tests for basic commit/rollback
functionality.

Fixes #39
 2017-04-19 11:28:36 +01:00
beorn7 e499ef8cac Merge bug fixes from branch 'release-1.6' 2017-04-18 18:06:01 +02:00
Björn Rabenstein 872ed88166 Merge pull request #2638 from prometheus/beorn7/storage 
storage: Don't panic if storage has no FPs even after initial wait
 2017-04-18 17:02:07 +02:00
beorn7 1dd737d7c3 storage: Don't panic if storage has no FPs even after initial wait 2017-04-18 15:59:12 +02:00
Fabian Reinartz 46c947d94f Merge pull request #45 from mattbostock/document_appender_not_goroutine_safe 
db: Add comment: Appender not goroutine safe
 2017-04-17 12:12:20 +02:00
Fabian Reinartz 72dd055cde Merge pull request #46 from mattbostock/patch-1 
db: Fix typo: reference
 2017-04-17 12:12:06 +02:00
Matt Layher 1faf33acac Add promlint check for histogram/summary reserved names (#2626) 2017-04-15 22:38:01 +01:00
Tobias Schmidt 09a977a782 Create sha256 checksums file during release 2017-04-15 12:26:51 -03:00
Matt Bostock 4d5ca4b9c1 db: Fix typo: reference 2017-04-14 22:02:06 +01:00
Tobias Schmidt 619cc0e0ff Merge pull request #2625 from mdlayher/promlint-cleanup 
Simplify promlint problems gathering, use protobuf accessors
 2017-04-14 22:47:30 +02:00
Matt Layher cc4198f421
Simplify promlint problems gathering, use protobuf accessors 2017-04-14 16:40:40 -04:00