RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2025-02-06 23:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,139 Commits 291 Branches 452 Tags 674 MiB
8633ac180e
Commit Graph

3139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anders Daljord Morken
8633ac180e Strip stray whitespace from bearer token file 
Apart from not trying to send a newline in a HTTP header,
this also allows Prometheus to build and pass tests with Go 1.7,
which features stricter checking of HTTP headers.
 2016-08-17 15:36:18 +02:00
Fabian Reinartz
54c0b10abb Merge pull request #1896 from amorken/master 
Bugfix: Avoid divide-by-zero panic on query_range?step=0
 2016-08-16 15:27:35 +02:00
Anders Daljord Morken
e9885ecb94 Bugfix: Avoid divide-by-zero panic on query_range?step=0 2016-08-16 15:20:34 +02:00
Fabian Reinartz
6bfd30269a Merge pull request #1894 from d-ulyanov/annotations-formatting 
Added toUpper and toLower formatting to templates
 2016-08-15 18:19:05 +02:00
Dmitry Ulianov
a8619111f3 Added toUpper and toLower formatting to templates 2016-08-15 14:00:22 +03:00
Tobias Schmidt
289e299eb5 Merge pull request #1890 from prometheus/fix-applyconfig-error 
Fix ApplyConfig() error handling
 2016-08-13 18:55:35 -04:00
Julius Volz
4a866c13be Fix ApplyConfig() error handling 
Currently, Prometheus starts up without any error when there is an
invalid rule file :-/
 2016-08-13 00:59:02 +02:00
Julius Volz
80b0e1b74c Merge pull request #1892 from fstab/assume-counters-start-at-zero-after-reset 
Assume counters start at zero after reset.
 2016-08-13 00:14:07 +02:00
Julius Volz
fe7b8b7fd1 Add missing license header to alerting_test.go 2016-08-13 00:11:52 +02:00
Fabian Stäber
08b6556ee6 Assume counters start at zero after reset. 2016-08-12 20:21:04 +02:00
Brian Brazil
d118acef96 Merge pull request #1889 from prometheus/fix-rule-escaping 
Fix rule HTML escaping issues
 2016-08-12 08:58:10 +01:00
Julius Volz
da7206ec29 Fix rule HTML escaping issues 
This was mentioned as part of https://github.com/prometheus/alertmanager/issues/452
 2016-08-12 02:59:41 +02:00
Fabian Reinartz
be596f82b4 Merge pull request #1783 from knyar/json 
Allow URLs in targets defined via a JSON file
 2016-08-10 09:42:17 +02:00
Fabian Reinartz
76edb86e86 Merge pull request #1878 from brancz/relabel-alerts 
allow relabeling of alerts
 2016-08-09 14:50:08 +02:00
Frederic Branczyk
b655aa002f introduce top level alerting config node 2016-08-09 14:19:25 +02:00
Frederic Branczyk
7714b9c781 move relabeling functionality to its own package 
also remove the returned error as it was always nil
 2016-08-09 14:19:20 +02:00
Frederic Branczyk
679d225c8d allow relabeling of alerts 
in case of dropping don't even enqueue them
 2016-08-09 14:18:31 +02:00
Fabian Reinartz
c9b58d3e27 Merge pull request #1877 from prometheus/fabxc-fix-joblink 
web/ui: fix job link
 2016-08-09 09:42:50 +02:00
Fabian Reinartz
df22684b5b web/ui: fix job link 2016-08-08 19:03:51 +02:00
Fabian Reinartz
98c0d33567 Merge pull request #1875 from brancz/idelta-function 
add idelta function
 2016-08-08 12:33:07 +02:00
Frederic Branczyk
f02df4138c refactor duplication of irate and idelta functions implementations 2016-08-08 10:52:00 +02:00
Fabian Reinartz
32fad9fbb4 Merge pull request #1874 from prometheus/fabxc-joblink 
Add HTML link for job name on target page
 2016-08-08 10:48:34 +02:00
Fabian Reinartz
cfe5c5fa15 Merge branch 'master' of https://github.com/cambridge-university-press/prometheus into cambridge-university-press-master 2016-08-08 10:46:36 +02:00
Fabian Reinartz
d3aa6c0133 Merge pull request #1872 from grandbora/ui-url-params 
Use query parameters in the /graph page
 2016-08-08 10:43:06 +02:00
Frederic Branczyk
dbf83666bb add idelta function 
similar to the irate function the idelta function calculates the delta
function with the last two values
 2016-08-08 10:40:50 +02:00
Frederic Branczyk
0ce5e7fe6d move legacy test for delta function 2016-08-08 10:02:58 +02:00
Bora Tunca
12bcc92311 Generate bindata.go 2016-08-08 09:52:14 +02:00
Bora Tunca
fc6cdd0611 Update backend helpers and templates to new url schema 2016-08-08 09:52:14 +02:00
Bora Tunca
445fac56e0 Refactor graph.js 2016-08-08 09:52:13 +02:00
Bora Tunca
3e18d86d8a Use query parameters in the url 2016-08-06 17:28:18 +02:00
Bora Tunca
3da825fc76 Point to correct place for GraphLinkForExpression 2016-08-06 17:28:18 +02:00
Julius Volz
d770783777 Neurotic cleanups to graph.js 2016-08-05 23:35:11 +02:00
Fabian Reinartz
70490fe568 Merge pull request #1805 from prometheus/higher-level-storage-interface 
Make the storage interface higher-level.
 2016-08-05 16:17:14 +02:00
Fabian Reinartz
806571074a Merge pull request #1869 from prometheus/fabxc-patch-1 
Clarify comment on rule evaluation
 2016-08-03 10:47:28 +02:00
Fabian Reinartz
9a269b5507 Clarify comment on rule evaluation 
Fixes #1866
 2016-08-03 08:29:51 +02:00
Fabian Reinartz
a4ee5b14d5 Merge pull request #1865 from prometheus/alert-name 
Remove __name__ from alerts sent to AM.
 2016-08-01 23:34:19 -07:00
Brian Brazil
6fc88d4b4d Remove __name__ from alerts sent to AM. 
Fixes #1861
 2016-08-01 23:32:41 +01:00
Fabian Reinartz
f9533754d1 Merge pull request #1862 from alicebob/removegraph 
'Remove Graph' links on the /graph page
 2016-07-31 12:19:27 -07:00
Harmen
7b4a67f651 make assets build 2016-07-31 16:32:25 +02:00
Harmen
0b883e24ba Add a 'Remove Graph' link to the 'Graph' screen 2016-07-31 16:30:23 +02:00
Steve Durrheimer
6633df1607 Merge pull request #1859 from prometheus/sdurrheimer-promu-go-version 
Use the default go version for the crossbuilt process
 2016-07-31 13:02:34 +02:00
Steve Durrheimer
d41e66e9a3
Use the default go version for the crossbuilt process 2016-07-30 11:19:56 +02:00
Fabian Reinartz
603b3e50b9 Merge pull request #1858 from fabric8io/docker-consoles-dir 
Docker: Move console dirs to /usr/share/prometheus
 2016-07-30 01:30:34 -07:00
Jimmi Dyson
bf6d92c63a
Docker: Move console dirs to /usr/share/prometheus 2016-07-29 14:00:47 +01:00
Andrew Hemming
7ebcd678ea Added HTML link for each job name 
Useful for quick navigation on the target page when there are many jobs
and targets

Corrected HTML link for each job name

Regenerated bindata
 2016-07-28 17:10:34 +01:00
Fabian Reinartz
3a1a5786a8 Merge pull request #1851 from prometheus/grobie/always-format-assets 
Always format generated assets
 2016-07-27 16:06:22 -07:00
Tobias Schmidt
4042392a2d Always format generated assets 
It's easy to forget formatting assets after re-generating them, so let's
do this automatically.
 2016-07-27 19:02:18 -04:00
Tobias Schmidt
0b6bec1af7 Merge pull request #1850 from caniszczyk/patch-1 
Add CNCF reference in the README
 2016-07-27 18:41:42 -04:00
Tobias Schmidt
5416518178 Fix go fmt of ui/bindata.go 2016-07-27 18:35:01 -04:00
Chris Aniszczyk
8066de91ca Add CNCF reference in the README 
A simple reference to the CNCF and link to the website.
 2016-07-27 17:15:03 -05:00