639d5c6f98
Merge pull request #3023 from tomwilkie/2945-remote-read-server
...
Implement remote read server in Prometheus.
2017-09-28 17:19:37 +01:00
16c95ae8e7
Merge branch 'release-1.7'
2017-09-21 18:27:12 +02:00
dd381356a5
Tweak floating point number rendering
2017-09-19 18:53:00 +02:00
61b6311504
Merge branch 'fix_ui_graph_decimal_axis' of git://github.com/yamatoya/prometheus into yamatoya-fix_ui_graph_decimal_axis
2017-09-19 18:30:18 +02:00
b1151bdabc
ui changed, limit the number of digits for the larger units is 5
2017-09-19 11:11:39 +09:00
1eac566d09
add ; , and change from B to G, and change from K to k, and add all the prefixes
2017-09-18 22:55:22 +09:00
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
e7aab2791a
Forward-merge bug fixes frem branch 'release-1.7'
2017-09-18 12:14:37 +02:00
7a8e340c1a
Merge branch 'fix_web_ui_utc' of git://github.com/yamatoya/prometheus into yamatoya-fix_web_ui_utc
2017-09-18 12:07:52 +02:00
5d707d3aa3
#2439 library version update JQuery / JQuery.Selection / JQuery.hotkey ( #3183 )
2017-09-18 11:45:57 +02:00
ff038a4a39
bug fix
2017-09-17 00:20:39 +09:00
7a3c348f83
fix decimal y-axis
2017-09-17 00:16:40 +09:00
758d64ffd9
s/EncodReadResponse/EncodeReadResponse/
2017-09-16 11:15:03 +02:00
febed48703
Implement remote read server in Prometheus.
2017-09-16 11:13:01 +02:00
738a51bea6
#2371 fix to display utc date at datetime picker
2017-09-16 11:38:29 +09:00
84211bd2df
Foward-merge bug fixes and cherry-picks from 'release-1.7'
2017-09-15 13:44:22 +02:00
a3fd7dd335
Backport the templating fix from master
...
The original fix is in commit 5f5d77848e
2017-09-14 18:12:00 +02:00
27bdddbf51
web: fix profile paths
2017-09-07 16:24:12 +02:00
aa3fb1e7c4
Point help to docs, not main Prometheus website
...
No matter how we refactor docs, `/docs/` will stay the prefix, so there's not long-term risk in changing this.
One we version docs, we should probably try and keep link & version in sync.
2017-08-25 10:53:36 +02:00
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
3101606756
Merge pull request #2711 from mxinden/api-config
...
Expose current Prometheus config via /status/config
2017-08-14 19:01:13 +02:00
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
5f5d77848e
Fix 'predefined escaper "html" disallowed in template' in `/targets` ( #3046 ) ( #3050 )
...
Issue #3046 is triggered by html/template changes in go1.9.
See https://tip.golang.org/pkg/html/template . Quote:
// To ease migration to Go 1.9 and beyond, "html" and "urlquery" will
// continue to be allowed as the last command in a pipeline. However, if the
// pipeline occurs in an unquoted attribute value context, "html" is
// disallowed. Avoid using "html" and "urlquery" entirely in new templates.
The commit also includes a trivial whitespace fix.
2017-08-11 18:31:46 +01:00
6cf62fe8ba
Update web/ui/bindata.go
2017-08-10 14:40:19 +02:00
245b8a0b37
Allow to collapse jobs at `/targets` page ( #2628 )
2017-08-09 17:10:30 +02:00
ff54c5c11a
2831 Add Healthy and Ready endpoints
2017-08-07 17:34:04 -03:00
3bb0667607
Merge branch 'release-1.7'
2017-07-21 19:40:30 +02:00
64cfe2e7f5
Add PATH_PREFIX to redirectToMigratedURL
...
Old grafana versions use this format, and it breaks with prometheus instances
not mounted in the root directory.
2017-07-11 17:36:17 +00:00
b6f89a1982
Parse custom step parameter correctly. ( #2928 )
...
Backport of 6a767b736b#2827 , #2861 .
2017-07-10 21:05:40 +02:00
38de290d5f
Console graph color scheme support ( #2900 )
...
Add a colorScheme parameter to PromConsole.Graph, to allow using custom colors in console graphs.
2017-07-04 15:30:12 +01:00
6a767b736b
Parse custom step parameter correctly. ( #2861 )
...
Fixes #2827 .
2017-06-19 17:22:59 +01:00
9063f8dedd
web: fix double prefix
2017-06-10 12:07:43 +02:00
d66799d7f3
Show gaps in graphs. ( #2766 )
...
Fixes #345
2017-05-26 16:17:48 +01:00
9c953064c3
check if result is a scalar in order to display correct number of returned time series
2017-05-24 14:07:24 +01:00
ad22606a3d
web: prefix redirect with ExternalURL path
2017-05-22 14:56:52 +02:00
45df5c2daf
Merge branch 'release-1.6'
2017-05-22 13:44:44 +02:00
9287a01bbf
Fixed fixed yaxis of stacked graph being cut off
2017-05-18 15:18:29 +01:00
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
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
04ad889751
Preserve Alertmanager URLs as *url.URL.
...
Render a nicer link in the web UI.
2017-04-25 16:17:46 +10:00
9eb1a5d6bf
Handle invalid query in graph UI ( #2652 )
2017-04-24 10:50:57 +01:00
ee62807b62
Added min/max to graph to accomodate for constant time series ( #2612 )
...
Added min/max to graph to accommodate constant time series
2017-04-12 14:25:25 +01:00
c72692fd75
Fixed issue of partially hidden y-axis values on graph ( #2589 )
2017-04-06 16:04:44 +01:00
beeb0b55c0
Merge pull request #2572 from weaveworks/2571-propagate-api-error
...
Add promql.ErrStorage, which the API propagates as a 500.
2017-04-06 16:36:20 +02:00
f0e8a5f37c
Add promql.ErrStorage, which is interpreted by the API as a 500.
2017-04-06 14:41:23 +01:00
26bedc9e00
Revert use of buildVersion in console templates. ( #2579 )
...
This function isn't available in console templates,
so go back to pre-#2468 state to get things working again.
2017-04-05 15:19:17 +01:00
17f15d024a
Small fixes. ( #2578 )
...
Fix typos. Simplify with gofmt -s
2017-04-05 14:24:22 +01:00
dafae52efa
Display total number of returned elements on console ( #2532 )
...
Display total number of returned elements on console
2017-04-03 11:52:25 +01:00
947c83be3b
Sort targets by instance within a job
...
Fixes https://github.com/prometheus/prometheus/issues/2536
2017-03-31 13:14:20 +02:00
8cd5aff8fe
Send instance="" with federation if instance not set.
...
This is needed for federating non-instance level metrics, so they don't
end up with the instance label of the prometheus target.
Also sort external labels, so label output order is consistent.
2017-03-30 06:48:48 +01:00
Tom Wilkie
beorn7
Takahito Yamatoya
Tom Wilkie
Fabian Reinartz
Richard Hartmann
Mark Adams
Max Inden
Karsten Weiss
Roman Khavronenko
emluque
Martín Ferrari
Alexey Palazhchenko
Alin Sinpalean
Frederic Branczyk
Brian Brazil
conorbroderick
Julius Volz
David Symonds
Conor Broderick
Brian Brazil
Julius Volz