Krasi Georgiev
6ce84dbcb1
rename ScrapeManager struct to Manager to remove stutter
2018-02-01 10:06:24 +00:00
Krasi Georgiev
b75428ec19
rename package retrieve to scrape
...
no fucnctinal changes just renaming retrieval to scrape
2018-02-01 09:55:07 +00:00
Krasi Georgiev
7858745c04
rename structs for consistency
2018-01-30 17:49:05 +00:00
Krasi Georgiev
587dec9eb9
rebased and resolved conflicts with the new Discovery GUI page
...
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
2017-12-18 20:10:03 +00:00
Krasi Georgiev
e405e2f1ea
refactored discovery
2017-12-18 17:22:49 +00:00
Conor Broderick
b5c30090b9
Merge pull request #3544 from Conorbro/relabel
...
Added service discovery view showing labels before and after relabelling
2017-12-13 17:33:55 +00:00
conorbroderick
8b6f3a1bd3
Added service discovery view showing labels before and after relabelling
2017-12-13 15:46:11 +00:00
pasquier-s
b3eccdd828
Fix 'addrConn.resetTransport' error ( #3004 ) ( #3517 )
...
net.Listener converts 0.0.0.0 to :: which fails for hosts where IPv6 is
disabled. This change uses the original listen address parameter instead
of grpcl.Addr().String().
2017-12-11 21:39:58 +08:00
Goutham Veeramachaneni
d8515b2580
Move Admin APIs to v1
...
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-12-04 00:13:43 +05:30
Fabian Reinartz
2d0e3746ac
rules: remove dependency on promql.Engine
2017-11-24 07:57:54 +01:00
Krasi Georgiev
e2f4850fea
Refactor main.go with oklog/pkg/group actors pattern
2017-11-11 12:33:15 +00:00
Julius Volz
099df0c5f0
Migrate "golang.org/x/net/context" -> "context" ( #3333 )
...
In some places, where ctxhttp or gRPC are concerned, we still need to use the
old contexts.
2017-10-24 21:21:42 -07:00
Fabian Reinartz
abf7c975c9
Merge branch 'master' into dev-2.0
2017-10-07 13:37:21 +02:00
beorn7
f20e6a0ae4
Only respond to API requests once the server is ready
2017-10-06 17:20:20 +02:00
Marc Sluiter
6a633eece1
Added go-conntrack for monitoring http connections ( #3241 )
...
Added metrics for in- and outgoing traffic with go-conntrack.
2017-10-06 11:22:19 +01:00
Fabian Reinartz
7a3261aa99
Merge pull request #3240 from Gouthamve/fix-admin-api
...
web/api: Fix typo which broke the 2.0 admin APIs.
2017-10-05 14:33:12 +02:00
Fabian Reinartz
2d0b8e8b94
Merge branch 'master' into dev-2.0
2017-10-05 13:09:18 +02:00
Goutham Veeramachaneni
35aaa2002d
web/api: Add tests for v2 admin API
...
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-10-05 15:25:09 +05:30
Goutham Veeramachaneni
d70f850a18
web/api: Fix typo which broke the 2.0 admin APIs.
...
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-10-04 17:02:32 +05:30
Fabian Reinartz
7b02bfee0a
web: start web handler while TSDB is starting up
2017-09-20 15:03:19 +02:00
Krasi Georgiev
b4b0999e7f
add prefix to the api when prometheus started with custom web.external-url
...
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
2017-09-18 17:59:27 +03:00
Tom Wilkie
bbc9671d50
Get profile handlers working again after #3054 and #3146 .
...
Ensures the pprod endpoints deal with path-prefixes correctly; adds a test so we don't break it again.
2017-09-18 13:27:09 +01:00
Goutham Veeramachaneni
3f0267c548
Merge branch 'dev-2.0' into go-kit/log
...
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-09-15 23:15:27 +05:30
Fabian Reinartz
e746282772
Merge branch 'master' into dev-2.0
2017-09-11 10:55:19 +02:00
Fabian Reinartz
d21f149745
*: migrate to go-kit/log
2017-09-08 22:01:51 +05:30
Fabian Reinartz
27bdddbf51
web: fix profile paths
2017-09-07 16:24:12 +02:00
Fabian Reinartz
87918f3097
Merge branch 'master' into dev-2.0
2017-09-04 14:09:21 +02:00
Mark Adams
77c816b309
Fix pprof endpoints when -web.route-prefix or -web.external-url is used ( #3054 )
...
Whenever a route prefix is applied, the router prepends the prefix to
the URL path on the request. For most handlers, this is not an issue
because the request's path is only used for routing and is not actually
needed by the handler itself. However, Prometheus delegates the handling
of the /debug/* endpoints to the http.DefaultServeMux which has it's own
routing logic that depends on the url.Path. As a result, whenever a
prefix is applied, the prefixed URL is passed to the DefaultServeMux
which has no awareness of the prefix and returns a 404.
This change fixes the issue by creating a new serveDebug handler which
routes requests /debug/* requests to appropriate net/http/pprof handler
and removing the net/http/pprof import in cmd/prometheus since it is no
longer necessary.
Fixes #2183 .
2017-08-23 00:00:56 +01:00
maximecharron
41884f0283
Fix double redirect if there is a route-prefix ( #3091 )
2017-08-19 19:44:15 +01:00
Max Inden
3101606756
Merge pull request #2711 from mxinden/api-config
...
Expose current Prometheus config via /status/config
2017-08-14 19:01:13 +02:00
Max Leonard Inden
1c96fbb992
Expose current Prometheus config via /status/config
...
This PR adds the `/status/config` endpoint which exposes the currently
loaded Prometheus config. This is the same config that is displayed on
`/config` in the UI in YAML format. The response payload looks like
such:
```
{
"status": "success",
"data": {
"yaml": <CONFIG>
}
}
```
2017-08-13 22:21:18 +02:00
Fabian Reinartz
921c6ebb3b
Merge branch 'dev-2.0' into mergemaster
2017-08-10 17:27:52 +02:00
Fabian Reinartz
25f3e1c424
Merge branch 'master' into mergemaster
2017-08-10 17:04:25 +02:00
Fabian Reinartz
0af43695de
web: log error missages on serving
2017-08-10 14:48:31 +02:00
Roman Khavronenko
245b8a0b37
Allow to collapse jobs at /targets
page ( #2628 )
2017-08-09 17:10:30 +02:00
emluque
ff54c5c11a
2831 Add Healthy and Ready endpoints
2017-08-07 17:34:04 -03:00
Fabian Reinartz
32226e30f5
Guard reload and quit endpoints by flag
2017-07-11 14:25:07 +02:00
Fabian Reinartz
45ac064669
web: disable Amin APIs by default
2017-07-10 09:29:41 +02:00
Fabian Reinartz
ccf9e62972
*: add admin grpc API
2017-07-10 09:14:14 +02:00
Fabian Reinartz
ca2b68889b
Merge branch 'master' into dev-2.0
2017-06-23 13:15:44 +02:00
Goutham Veeramachaneni
67dc73fd59
Flag changes for 2.0
...
Fixes : prometheus/prometheus#2087
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 20:21:41 +05:30
Frederic Branczyk
9063f8dedd
web: fix double prefix
2017-06-10 12:07:43 +02:00
Fabian Reinartz
4c31061251
Merge branch 'master' into dev-2.0
2017-05-24 15:36:17 +02:00
Frederic Branczyk
ad22606a3d
web: prefix redirect with ExternalURL path
2017-05-22 14:56:52 +02:00
Fabian Reinartz
06c2b76cd4
Merge branch 'master' into uptsdb
2017-05-16 16:48:37 +02:00
Julius Volz
ac203ef0ee
Add externalURL template function ( #2716 )
...
This allows users to e.g. add links back to the generating Prometheus
right in their alert templates.
2017-05-13 15:47:04 +02:00
Fabian Reinartz
6e804b3497
Merge branch 'master' into dev-2.0
2017-05-12 13:29:58 +02:00
Tom Wilkie
4d9b917d11
Instrument Prometheus with OpenTracing ( #2554 )
...
* Use request.Context() instead of a global map of contexts.
* Add some basic opentracing instrumentation on the query path.
* Remove tracehandler endpoint.
2017-05-02 18:49:29 -05:00
Fabian Reinartz
73b8ff0ddc
Merge branch 'master' into dev-2.0
2017-04-27 10:19:55 +02:00
David Symonds
04ad889751
Preserve Alertmanager URLs as *url.URL.
...
Render a nicer link in the web UI.
2017-04-25 16:17:46 +10:00