Commit Graph

2328 Commits (02960343bb5fbb71acf9fd2f0f82603d812e2ce4)
 

Author SHA1 Message Date
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
Julius Volz 58780a8c79 Merge pull request #1045 from prometheus/anchored-label-replace
9 years ago
Julius Volz 4c90168130 Merge pull request #1044 from prometheus/config-anchored-regexes
9 years ago
Julius Volz 61c42c8da0 Change relabel_replace() to do full-string matches.
9 years ago
Julius Volz f63a899744 Change config regexes to full-string matches.
9 years ago
Julius Volz dfbda8fd3f Merge pull request #1041 from Dieterbe/fix-fanout-comment
9 years ago
Dieter Plaetinck e1dacc56e6 fix comment.
9 years ago
Fabian Reinartz bfdd474202 Merge pull request #1040 from prometheus/fixfilesd
9 years ago
Fabian Reinartz 542da6774e Fix draining of file watcher events
9 years ago
Fabian Reinartz facf60e033 Merge pull request #1033 from dln/serverset-shard
9 years ago
Daniel Lundin 4abf54b747 serverset: extract shard number from serverset data
9 years ago
Brian Brazil 4d196fea6b Merge pull request #1032 from prometheus/scalar-metric
9 years ago
Brian Brazil 3bcdb2bbba rules: Allow for setting labels on LHS on scalars
9 years ago
Julius Volz 9bca70710b Merge pull request #1034 from prometheus/fix-pprof
9 years ago
Julius Volz da2499d5a5 Add POST handler for /debug to fix CPU profiling.
9 years ago
Julius Volz 29eaa8c7cf Merge pull request #1030 from prometheus/fix-flakey-filesd
9 years ago
Julius Volz 3fd5826589 Fix flakey FileSD test.
9 years ago
Julius Volz 744d5d5a7a Merge pull request #1029 from prometheus/vet-fixes
9 years ago
Julius Volz 78f5a93ea6 Merge pull request #1028 from prometheus/lint-fixes
9 years ago
Julius Volz 995d3b831d Fix most golint warnings.
9 years ago
Julius Volz 963ad82dcb Fix "go vet" errors.
9 years ago