Commit Graph

3003 Commits (f4398d5bdf11295fc8d03ef4b66025285178046a)
 

Author SHA1 Message Date
Fabian Reinartz f4398d5bdf Merge pull request #1782 from prometheus/fabxc-testflags
9 years ago
Fabian Reinartz 8c24dfdb86 cmd/prometheus: use own flag set
9 years ago
Fabian Reinartz b3f321b38a Merge pull request #1780 from prometheus/fabxc-k8s-locks
9 years ago
Fabian Reinartz 57333d1831 discovery/kubernetes: add missing locking
9 years ago
Fabian Reinartz 2901376940 Merge pull request #1777 from prometheus/fabxc-patch-1
9 years ago
Fabian Reinartz 4d1985e405 Merge pull request #1778 from mattbostock/fix_annotations
9 years ago
Matt Bostock cc98e164d3 promql: Fix annotations conflated with labels
9 years ago
Fabian Reinartz 472b8363a1 readme: update debian and container releases
9 years ago
Fabian Reinartz 44036a08d0 Merge pull request #1725 from nicholascapo/use-consul-service-address
9 years ago
Fabian Reinartz e1cf13aaef Merge pull request #1771 from prometheus/make-storage-public
9 years ago
Julius Volz 91401794fa storage: Make MemorySeriesStorage a public type
9 years ago
Fabian Reinartz c673aa2b34 Merge pull request #1770 from prometheus/milliseconds-console
9 years ago
Brian Brazil b86db088b5 The metrics are no longer ms, we can remove the scaling.
9 years ago
Fabian Reinartz f68789dc5a Merge pull request #1767 from fabric8io/k8s-sd-https-config
9 years ago
Jimmi Dyson 5733de0dfe
Kubernetes SD: Update example config with TLS options
9 years ago
Fabian Reinartz 62af249d06 Merge pull request #1761 from prometheus/fabxc-legacyapi
9 years ago
Brian Brazil ba9fbb9ea2 Merge pull request #1765 from prometheus/on-dummy
9 years ago
Brian Brazil 3b89616d82 Allow on, ignoring, by and without wit empty laberls.
9 years ago
Brian Brazil 246a817300 Flip vector matching to be ignoring by default.
9 years ago
Fabian Reinartz d431187f77 Merge pull request #1763 from prometheus/fabxc-sec-metrics
9 years ago
Fabian Reinartz 425736a377 *: remove last remainers of non-second metrics
9 years ago
Brian Brazil dc4d5fef2a Merge pull request #1762 from prometheus/fabxc-common
9 years ago
Fabian Reinartz e2bc30585f vendor: update common/expfmt
9 years ago
Fabian Reinartz 97f62c021e api: drop legacy API
9 years ago
Fabian Reinartz 6f6dddb230 Merge pull request #1759 from prometheus/separate-querier
9 years ago
Julius Volz b7b6717438 Separate query interface out of local.Storage.
9 years ago
Fabian Reinartz 0e281f5500 Merge pull request #1687 from royels/issue-1629
9 years ago
royels 2fdc5717a3 promql: add power binary operation
9 years ago
Fabian Reinartz f928ca13d0 Merge pull request #1754 from prometheus/jan11011977-master
9 years ago
Jan van Valburg 68f3df49d0 stoarge: fix 'access denied' error on Windows
9 years ago
Fabian Reinartz beecbe3d2f Merge branch 'release-0.20'
9 years ago
Brian Brazil f3e3befb83 Merge pull request #1746 from fatih/fix-alertstmt-print
9 years ago
Fatih Arslan 362e44501a promql: fix printing annotations of an *AlertStmt
9 years ago
Nicholas Capo 84334a8410 discovery: use consul service address if available
9 years ago
Fabian Reinartz aeab25c35d Merge pull request #1742 from prometheus/fabxc-0.20.0
9 years ago
Fabian Reinartz 3a9b739f30 *: cut 0.20.0
9 years ago
Fabian Reinartz bae1cfee69 Merge pull request #1739 from prometheus/fabxc-opendbsd-arm
9 years ago
Fabian Reinartz 384153fe1f promu: don't build openbsd/arm and mips
9 years ago
Fabian Reinartz 4aeab798e8 Merge pull request #1738 from prometheus/release-0.19
9 years ago
Fabian Reinartz 3c80609fce Merge pull request #1737 from prometheus/fabxc-0.19.3
9 years ago
Fabian Reinartz a5b35498a8 *: bump version to 0.19.3
9 years ago
Fabian Reinartz 4c864c8a88 retrieval: don't sync to uninitialized scrape pool
9 years ago
Fabian Reinartz 4f139c765b Merge pull request #1736 from prometheus/fabxc-ctxpanic
9 years ago
Fabian Reinartz 452486bd22 Merge pull request #1735 from prometheus/beorn7/race
9 years ago
Fabian Reinartz d0eeae9d0e retrieval: don't sync to uninitialized scrape pool
9 years ago
beorn7 03adbe57e4 discovery/marathon: Fix race conditions in test
9 years ago
Björn Rabenstein 43a36e545b Merge pull request #1732 from prometheus/beorn7/doc
9 years ago
beorn7 44aa7ec46d doc: Update scrape config in example prometheus.yml
9 years ago
Björn Rabenstein 2ea3a837c3 Merge pull request #1731 from prometheus/release-0.19
9 years ago
Björn Rabenstein bc58d3dc50 Merge pull request #1729 from rohit01/release-0.19
9 years ago