Commit Graph

1992 Commits (beae7b6afb42351685189ce94c95732b176e2102)
 

Author SHA1 Message Date
Julius Volz b4dfbf89a8 Merge pull request #815 from prometheus/fabxc/fix-date
10 years ago
Fabian Reinartz f97db8d4e5 cmd/prometheus: fix version output
10 years ago
Fabian Reinartz 459d18cf18 Merge pull request #812 from Marmelatze/consul_services
10 years ago
Florian Pfitzer 0ac7e7217e Use Consul ServiceAddress instead of Address when set
10 years ago
Fabian Reinartz 2bf7e1ac98 Merge pull request #811 from prometheus/fabxc/version
10 years ago
Fabian Reinartz 119801027f web: expose a version information endpoint
10 years ago
Brian Brazil a79cffcc44 Merge pull request #784 from brian-brazil/serverset
10 years ago
Fabian Reinartz 39edc2df7a version: move version information into separate package.
10 years ago
Brian Brazil 4d895242f9 Add support for Zookeeper Serversets for SD.
10 years ago
Julius Volz 95bd64c770 Merge pull request #806 from metcalfc/fix_609
10 years ago
Chad Metcalf af52579189 Handle building without git.
10 years ago
Fabian Reinartz 330ed7b9f2 Merge pull request #809 from prometheus/update-make-format
10 years ago
Fabian Reinartz 7b302f1a59 Merge pull request #808 from prometheus/fabxc/ref-main
10 years ago
Fabian Reinartz 31325c1fd0 make: adjust to new main location.
10 years ago
Fabian Reinartz 85d7c7640a web: remove flags, refactor handlers
10 years ago
Fabian Reinartz a0b3aaa551 notification: remove flags
10 years ago
Fabian Reinartz b105e26f4d storage: remove global flags
10 years ago
Fabian Reinartz fe301d7946 promql: remove global flags
10 years ago
Fabian Reinartz de66e32a4d cmd/prometheus: create new main package.
10 years ago
Julius Volz f10effceb1 Update file exclusion list for `make format`.
10 years ago
Brian Brazil 689ef7f678 Merge pull request #803 from prometheus/relabel-scrapes
10 years ago
Fabian Reinartz 5da5ea3ee2 Merge pull request #804 from prometheus/blob-fmt
10 years ago
Brian Brazil 27ef54263e Web: Format files.go when it is built.
10 years ago
Brian Brazil 0dbae36d36 Allow ingested metrics to be relabeled.
10 years ago
Brian Brazil 58ceae82bc Revert "Allow ingested metrics to be relabeled."
10 years ago
Brian Brazil f2f26ca08f Allow ingested metrics to be relabeled.
10 years ago
Julius Volz 5e50addc87 Merge pull request #801 from sdurrheimer/master
10 years ago
Steve Durrheimer f61ffb4fc0 Fix Dockerfile with recent embed-static.sh/go-bindata change
10 years ago
Julius Volz 3c6c80d179 Merge pull request #800 from prometheus/pad-data-range
10 years ago
Julius Volz b9b20fd80e Always show selected range, regardless of returned data.
10 years ago
Julius Volz 395a0b3b11 Merge pull request #799 from prometheus/multiline-expr-input
10 years ago
Julius Volz 8bb578c1fe Change expression input field to multi-line textarea.
10 years ago
Julius Volz 6247bd5a5a Merge pull request #798 from miekg/hup-signal-handing
10 years ago
Miek Gieben 4b43e825f4 Rename block to hupReady
10 years ago
Miek Gieben d8651302fc Start HUP signal handler earlier
10 years ago
Fabian Reinartz 3ec2e2323d Merge pull request #793 from prometheus/fabxc/make
10 years ago
Julius Volz 1e59167d48 Merge pull request #797 from prometheus/keep-common
10 years ago
Fabian Reinartz 9013319d3a Merge pull request #796 from prometheus/fabxc/cfg-err
10 years ago
Julius Volz 5e2d1c1464 Deprecate `keeping_extra`, rename it to `keep_common`.
10 years ago
Julius Volz 0542733964 Merge pull request #795 from prometheus/fabxc/promql-print
10 years ago
Fabian Reinartz 116e6df096 config: raise error on unknown config parameters.
10 years ago
Fabian Reinartz 3a24a7779d config: extend and format config example/test.
10 years ago
Fabian Reinartz e7659f908c promql: remove DotGraph methods from nodes.
10 years ago
Fabian Reinartz c716d8a47b promql: fix aggregation expression String() method.
10 years ago
Fabian Reinartz 8d304d95e5 make: do not call go-bindata on building.
10 years ago
Fabian Reinartz 6bb5e3f8cd Merge pull request #792 from prometheus/fabxc/range-fix
10 years ago
Fabian Reinartz c32ae22119 promql: fix missing metric in range results.
10 years ago
Julius Volz ae2bff45ea Merge pull request #790 from prometheus/ignore-data-dir
10 years ago
Julius Volz bd47e159d9 Add "data" directory to .gitignore.
10 years ago
Julius Volz 723e070867 Merge pull request #789 from prometheus/change-storage-path-default
10 years ago