mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 15:09:39 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
3076 commits 243 branches 444 tags 649 MiB
Commit graph

3076 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julius Volz 2eaccdd111 Merge pull request #1697 from sigma-star/master 
Fix JS XHR requests in prom_console.js on IE11
 2016-06-01 20:15:02 -05:00
David Gstir 2dd80225a4 Fix JS XHR requests in prom_console.js on IE11 
IE11 does not support automatic JSON parsing for responses with
xhr.responseType = 'json', so we have to to do it manually.
 2016-06-01 19:44:04 +02:00
Fabian Reinartz 9e952a55c6 Merge pull request #1686 from alileza/master 
change file_sd names to files, for consistency
 2016-06-01 07:49:34 -07:00
Ali Reza c81b4e8a87 change config names to files for consistency 2016-05-30 07:47:58 +07:00
Marios Andreopoulos 3f07a6b9d0
Fix consoles and console_libraries path in Dockerfile. 2016-05-30 01:02:38 +03:00
beorn7 e3ec8fa83b Merge branch 'release-0.19' 2016-05-29 21:06:44 +02:00
Fabian Reinartz 23ca13c2fb Merge pull request #1688 from prometheus/beorn7/0.19 
Cut 0.19.2
 2016-05-29 10:41:00 -07:00
beorn7 592f02925e Cut 0.19.2 
Note that this will be merged into the release-0.19 branch and only
includes bug fixes, not other recent commits.

This is low-risk and contains critical bug fixes and should therefore
be released ASAP.
 2016-05-29 18:44:40 +02:00
Björn Rabenstein 3113c0d719 Merge pull request #1685 from prometheus/beorn7/fix-group 
Correctly stringify GROUP_x modifiers without labels
 2016-05-29 18:34:58 +02:00
beorn7 5408666387 Correctly stringify GROUP_x modifiers without labels 
Since rule evaluations work via String(), this fixes evaluation of
rules containing GROUP_x modifiers without labels. This change is the
minimal bugfix (so that we can release a fixed version without
risk). It does not intend to implement any additional features (like
allowing `GROUP_LEFT()` or `ON()` or even `ON` - see discussion in
https://github.com/prometheus/prometheus/issues/1597 ).
 2016-05-28 20:15:02 +02:00
Brian Brazil f55a1d463d Merge pull request #1670 from gregorygtseng/tls-servername-const 
Unexport testing constant
 2016-05-26 22:49:39 +01:00
Gregory G. Tseng 4ceedffe86 Unexport testing constant 2016-05-26 14:42:17 -07:00
Brian Brazil bd6568ccc9 Merge pull request #1658 from gregorygtseng/tls-servername-override 
Add ServerName into TLS Config
 2016-05-26 22:33:07 +01:00
Gregory G. Tseng 7997c14b0d Add ServerName into TLS Config 2016-05-26 14:24:49 -07:00
Julius Volz 26f3b7bbc6 Merge pull request #1669 from alileza/master 
remove keeping_extra because it's replaced with keep_common
 2016-05-26 15:04:19 -05:00
Julius Volz 194a486c60 Merge pull request #1660 from alileza/add_http_errorlog 
Log HTTP server errors using common/log
 2016-05-26 15:03:15 -05:00
Ali Reza 5e2b197a00 Update vendoring for github.com/prometheus/common/log 2016-05-27 00:20:54 +07:00
Ali Reza 624717e801 Log HTTP server errors using common/log 
change naming to be more descriptive.
Fixes #1651

remove pointer receiver

use common/log error logger
 2016-05-27 00:20:40 +07:00
Ali Reza e7eba75690 remove keeping_extra because it's replaced with keep_common 
change all keepExtra label into keepCommon, and move action into removed list

change incorrect token list
 2016-05-27 00:02:04 +07:00
Björn Rabenstein f24b8b6c1b Merge pull request #1668 from roman-vynar/missed-path-prefix 
Added missed pathPrefix to Status sub-menus
 2016-05-26 17:29:57 +02:00
Roman Vynar 9d616952b3
Added missed pathPrefix to Status sub-menus 2016-05-26 17:42:28 +03:00
Fabian Reinartz 0b6e5eb7dd Merge branch 'release-0.19' 2016-05-25 17:40:42 -07:00
Fabian Reinartz 500a494c9c *: add 0.19.1 changelog 2016-05-25 17:33:01 -07:00
Fabian Reinartz 8074281180 *: bump version to 0.19.1 2016-05-25 17:33:01 -07:00
Fabian Reinartz 4e087165aa retrieval: handle nil target groups from updates 2016-05-25 17:33:01 -07:00
Fabian Reinartz 8fe8ccce63 retrieval: document panic behavior 2016-05-25 17:33:01 -07:00
Fabian Reinartz 021ef27fe3 retrieval: don't panic on non-HTTP scheme 2016-05-25 17:33:01 -07:00
beorn7 9a506fae47 Remove a spurious "w" from _base.html 2016-05-25 17:33:00 -07:00
Fabian Reinartz 810e0e254b Fix typo 2016-05-25 17:33:00 -07:00
Fabian Reinartz ec3aa12163 Fix indentation 2016-05-25 17:31:22 -07:00
Fabian Reinartz b26f4c0537 *: add 0.19.0 changelog 2016-05-25 17:31:22 -07:00
Fabian Reinartz a3f5ab0b72 *: bump version to 0.19.0 2016-05-25 17:31:22 -07:00
Pieter Lange ed0008b435 Minor typo 2016-05-25 17:31:22 -07:00
Bjoern Rabenstein c01d2924a2 Make assets without debug settings 2016-05-25 17:31:21 -07:00
Fabian Reinartz 74c448386c Merge pull request #1665 from prometheus/fabxc-retrpanic 
Fix kubernetes SD crash
 2016-05-25 17:13:27 -07:00
Fabian Reinartz 12b03db373 retrieval: handle nil target groups from updates 2016-05-25 16:59:16 -07:00
Brian Brazil e222e17073 Merge pull request #1664 from prometheus/fabxc-scheme-panic 
retrieval: don't panic on non-HTTP scheme
 2016-05-26 00:19:04 +01:00
Fabian Reinartz ea36efbbd1 retrieval: document panic behavior 2016-05-25 16:17:25 -07:00
Fabian Reinartz a5ba166935 retrieval: don't panic on non-HTTP scheme 2016-05-25 16:05:20 -07:00
Brian Brazil 7c237eee0e Merge pull request #1661 from prometheus/beorn7/ui 
Remove a spurious "w" from `_base.html`
 2016-05-25 13:10:06 +01:00
beorn7 93460fb853 Remove a spurious "w" from _base.html 2016-05-25 13:59:50 +02:00
Joshua Rubin fd7775e251
fix build with multi-part $GOPATH 2016-05-24 16:50:27 -06:00
Fabian Reinartz e1848445f4 Fix typo 2016-05-24 15:11:46 -07:00
Fabian Reinartz c4c2756a39 Fix indentation 2016-05-24 14:50:10 -07:00
Fabian Reinartz 58a7f5b089 Merge pull request #1655 from prometheus/release-0.19 
Release 0.19
 2016-05-24 14:20:59 -07:00
Fabian Reinartz 604d7114df *: add 0.19.0 changelog 2016-05-24 14:04:58 -07:00
Fabian Reinartz 0d466e76cc *: bump version to 0.19.0 2016-05-24 13:34:48 -07:00
Brian Brazil 642eb59f87 Merge pull request #1652 from pieterlange/patch-1 
Minor typo
 2016-05-24 10:27:46 +01:00
Pieter Lange 427b322078 Minor typo 2016-05-24 11:12:42 +02:00
Brian Brazil afc95820b1 Merge pull request #1650 from prometheus/beorn7/ui 
Make assets without debug settings
 2016-05-23 10:22:17 +01:00