Commit Graph

2198 Commits (ce7f31e03c0722fdfbffcd93e60f5acb4010977f)
 

Author SHA1 Message Date
Brian Brazil ce7f31e03c promql: Bump sleep in query timeout test
9 years ago
Brian Brazil 29de4ee2b0 Merge pull request #1078 from prometheus/whats-our-vector-victor
9 years ago
Brian Brazil 9b382647b5 Remove optional vector() 2nd argument
9 years ago
Fabian Reinartz 896928ad00 Fix redirect path
9 years ago
Fabian Reinartz d7b21f2fdb Merge pull request #1039 from prometheus/startpage
9 years ago
Fabian Reinartz 87b1d47e2b Change UI start page
9 years ago
Fabian Reinartz a1617d90f4 Merge pull request #1073 from prometheus/whats-our-vector-victor
9 years ago
Fabian Reinartz bae9816834 Merge branch 'master' of github.com:prometheus/prometheus
9 years ago
Fabian Reinartz b2c6378aae Fix go1.5 compile flag warnings
9 years ago
Julius Volz af58d784fd Merge pull request #1076 from prometheus/remove-config-change-notice
9 years ago
Julius Volz d73c8a4f0b Remove notice about 0.14.x config file format change.
9 years ago
Björn Rabenstein 2c3c1ba69f Merge pull request #1075 from prometheus/beorn7/storage
9 years ago
beorn7 daeccdd0e9 Fix DropMetricsForFingerprints
9 years ago
Julius Volz e7c1db42f3 Merge pull request #1072 from fabric8io/kubernetes-discovery
9 years ago
Brian Brazil 69f5fa0c1e promql: Add vector function.
9 years ago
Jimmi Dyson 7ef9399920 Clean up kubernetes http response bodies
9 years ago
Fabian Reinartz d6ed1df4fb Merge pull request #1070 from amorken/forgotten-close
9 years ago
Anders Daljord Morken 9fb65a91af Close HTTP connections on HTTP errors too.
9 years ago
Fabian Reinartz 66f376f75a Merge pull request #1068 from prometheus/go1.5.1
9 years ago
Fabian Reinartz 8456b7e12f Use go1.5.1
9 years ago
Julius Volz 6e393807c3 Merge pull request #1066 from prometheus/fix-bool
9 years ago
Julius Volz 6d3e054692 Fix bool modifier in recording rules and printing.
9 years ago
Julius Volz 9a70ee752e Merge pull request #1063 from fabric8io/kubernetes-discovery
9 years ago
Jimmi Dyson ec04ba38a2 Kubernetes SD config check
9 years ago
Fabian Reinartz 58c32f84ce Merge pull request #1055 from fabric8io/kubernetes-discovery
9 years ago
Jimmi Dyson a1574aa2b3 Move TLS options to scrape config
9 years ago
Julius Volz ffc5142c54 Merge pull request #1058 from prometheus/check-errors
9 years ago
Julius Volz 6774a73878 Fix error checking and logging around checkpointing.
9 years ago
Julius Volz 011faf9057 Fix typo in comment.
9 years ago
Fabian Reinartz 09c353c272 Change mail address
9 years ago
Fabian Reinartz e298463fd6 Merge pull request #1053 from prometheus/diag
9 years ago
Fabian Reinartz 1a3ee28cd2 Point README to new architecture diagram
9 years ago
Fabian Reinartz e761f0d664 Update architecture diagram
9 years ago
Fabian Reinartz 1ef5ed0cf2 Merge pull request #1048 from xperimental/fix/marathon-config
9 years ago
Robert Jacob eb7416e71f Fix missing unmarshal for Marathon SD config.
9 years ago
Julius Volz b7b7b2e883 Merge pull request #1050 from fabric8io/kubernetes-discovery
9 years ago
Jimmi Dyson d7a7fd4589 Kubernetes SD improvements
9 years ago
Fabian Reinartz d839980fcb Merge pull request #1051 from prometheus/globallabels
9 years ago
Fabian Reinartz 8fa719f778 Attach global labels to remote storage samples
9 years ago
Fabian Reinartz 5fed076a76 Attach global labels to outgoing alerts.
9 years ago
Fabian Reinartz 9bbd9264e2 Add global labels to federation
9 years ago
Brian Brazil 9ec11b1847 Merge pull request #1049 from prometheus/bool-nofilter
9 years ago
Fabian Reinartz bc89b98a7d Merge branch 'master' of github.com:prometheus/prometheus
9 years ago
Fabian Reinartz e3d809024c Change email address
9 years ago
Fabian Reinartz cc1a2a2061 Remove attachment of global labels upon ingestion
9 years ago
Fabian Reinartz e2b979868b Merge pull request #1047 from swsnider/upstreamed
9 years ago
Silas Snider b2cb637f97 Add instrumentation around configuration reloads.
9 years ago
Brian Brazil 29e8dc2c49 promql: Add 'bool' modifier to comparison functions
9 years ago
Fabian Reinartz 4459265739 Merge branch 'master' of github.com:prometheus/prometheus
9 years ago
Fabian Reinartz ebf417a282 Fix map initialization
9 years ago