Commit Graph

174 Commits (380cacd3a4dbe7b9454aa68fe23b2b2961e758c5)

Author SHA1 Message Date
Krasi Georgiev 587dec9eb9 rebased and resolved conflicts with the new Discovery GUI page
7 years ago
Krasi Georgiev e405e2f1ea refactored discovery
7 years ago
Conor Broderick b5c30090b9
Merge pull request #3544 from Conorbro/relabel
7 years ago
conorbroderick 8b6f3a1bd3 Added service discovery view showing labels before and after relabelling
7 years ago
pasquier-s b3eccdd828 Fix 'addrConn.resetTransport' error (#3004) (#3517)
7 years ago
Goutham Veeramachaneni d8515b2580 Move Admin APIs to v1
7 years ago
Fabian Reinartz 2d0e3746ac rules: remove dependency on promql.Engine
7 years ago
Krasi Georgiev e2f4850fea Refactor main.go with oklog/pkg/group actors pattern
7 years ago
Julius Volz 099df0c5f0 Migrate "golang.org/x/net/context" -> "context" (#3333)
7 years ago
Fabian Reinartz abf7c975c9 Merge branch 'master' into dev-2.0
7 years ago
beorn7 f20e6a0ae4 Only respond to API requests once the server is ready
7 years ago
Marc Sluiter 6a633eece1 Added go-conntrack for monitoring http connections (#3241)
7 years ago
Fabian Reinartz 7a3261aa99 Merge pull request #3240 from Gouthamve/fix-admin-api
7 years ago
Fabian Reinartz 2d0b8e8b94 Merge branch 'master' into dev-2.0
7 years ago
Goutham Veeramachaneni 35aaa2002d
web/api: Add tests for v2 admin API
7 years ago
Goutham Veeramachaneni d70f850a18
web/api: Fix typo which broke the 2.0 admin APIs.
7 years ago
Fabian Reinartz 7b02bfee0a web: start web handler while TSDB is starting up
7 years ago
Krasi Georgiev b4b0999e7f add prefix to the api when prometheus started with custom web.external-url
7 years ago
Tom Wilkie bbc9671d50 Get profile handlers working again after #3054 and #3146.
7 years ago
Goutham Veeramachaneni 3f0267c548 Merge branch 'dev-2.0' into go-kit/log
7 years ago
Fabian Reinartz e746282772 Merge branch 'master' into dev-2.0
7 years ago
Fabian Reinartz d21f149745 *: migrate to go-kit/log
7 years ago
Fabian Reinartz 27bdddbf51 web: fix profile paths
7 years ago
Fabian Reinartz 87918f3097 Merge branch 'master' into dev-2.0
7 years ago
Mark Adams 77c816b309 Fix pprof endpoints when -web.route-prefix or -web.external-url is used (#3054)
7 years ago
maximecharron 41884f0283 Fix double redirect if there is a route-prefix (#3091)
7 years ago
Max Inden 3101606756 Merge pull request #2711 from mxinden/api-config
7 years ago
Max Leonard Inden 1c96fbb992
Expose current Prometheus config via /status/config
7 years ago
Fabian Reinartz 921c6ebb3b Merge branch 'dev-2.0' into mergemaster
7 years ago
Fabian Reinartz 25f3e1c424 Merge branch 'master' into mergemaster
7 years ago
Fabian Reinartz 0af43695de web: log error missages on serving
7 years ago
Roman Khavronenko 245b8a0b37 Allow to collapse jobs at `/targets` page (#2628)
7 years ago
emluque ff54c5c11a 2831 Add Healthy and Ready endpoints
7 years ago
Fabian Reinartz 32226e30f5 Guard reload and quit endpoints by flag
7 years ago
Fabian Reinartz 45ac064669 web: disable Amin APIs by default
7 years ago
Fabian Reinartz ccf9e62972 *: add admin grpc API
7 years ago
Fabian Reinartz ca2b68889b Merge branch 'master' into dev-2.0
8 years ago
Goutham Veeramachaneni 67dc73fd59
Flag changes for 2.0
8 years ago
Frederic Branczyk 9063f8dedd
web: fix double prefix
8 years ago
Fabian Reinartz 4c31061251 Merge branch 'master' into dev-2.0
8 years ago
Frederic Branczyk ad22606a3d
web: prefix redirect with ExternalURL path
8 years ago
Fabian Reinartz 06c2b76cd4 Merge branch 'master' into uptsdb
8 years ago
Julius Volz ac203ef0ee Add externalURL template function (#2716)
8 years ago
Fabian Reinartz 6e804b3497 Merge branch 'master' into dev-2.0
8 years ago
Tom Wilkie 4d9b917d11 Instrument Prometheus with OpenTracing (#2554)
8 years ago
Fabian Reinartz 73b8ff0ddc Merge branch 'master' into dev-2.0
8 years ago
David Symonds 04ad889751 Preserve Alertmanager URLs as *url.URL.
8 years ago
Fabian Reinartz 8ffc851147 Merge branch 'master' into dev-2.0
8 years ago
Julius Volz 947c83be3b Sort targets by instance within a job
8 years ago
Fabian Reinartz 397f001ac5 Merge branch 'master' into dev-2.0
8 years ago