45ac064669
web: disable Amin APIs by default
2017-07-10 09:29:41 +02:00
ccf9e62972
*: add admin grpc API
2017-07-10 09:14:14 +02:00
ca2b68889b
Merge branch 'master' into dev-2.0
2017-06-23 13:15:44 +02:00
7be94d6643
Fix display of before-relabeling labels
2017-06-22 15:36:17 -04:00
6a767b736b
Parse custom step parameter correctly. ( #2861 )
...
Fixes #2827 .
2017-06-19 17:22:59 +01:00
37e7b69f56
Merge remote-tracking branch 'upstream/dev-2.0' into rulegroups
...
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-19 16:34:55 +05:30
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
d407bd150c
Consolidate the duration params in CLI
...
* All CLI params moved to model.Duration
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-16 20:20:57 +05:30
5ff283a7b7
Reflect the grouping in the UI
...
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-14 16:09:14 +05:30
9063f8dedd
web: fix double prefix
2017-06-10 12:07:43 +02:00
669075c6b9
Merge branch 'master' into dev-2.0
2017-06-06 09:36:51 +02:00
d66799d7f3
Show gaps in graphs. ( #2766 )
...
Fixes #345
2017-05-26 16:17:48 +01:00
4c31061251
Merge branch 'master' into dev-2.0
2017-05-24 15:36:17 +02:00
e5f94145b8
Drop series for federation if latest sample is stale.
2017-05-24 14:27:17 +01:00
220e78b9c3
Consider a series stale after 4.1 intervals with no data.
...
To cover the cases where stale markers may not be available,
we need to infer the interval and mark series stale based on that.
As we're lacking stale markers this is less accurate, however
it should be good enough for these cases.
We need 4 intervals as if say we had data at t=0 and t=10,
coming via federation. The next data point should be at t=20 however it
could take up to t=30 for it actually to be ingested, t=40 for it to be
scraped via federation and t=50 for it to be ingested.
We then add 10% on to that for slack, as we do elsewhere.
2017-05-24 14:27:17 +01:00
c02c25d5ba
Allow peeking back further in buffer.
2017-05-24 14:27:17 +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
06c2b76cd4
Merge branch 'master' into uptsdb
2017-05-16 16:48:37 +02: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
6e804b3497
Merge branch 'master' into dev-2.0
2017-05-12 13:29:58 +02:00
9a9211845e
ui: fix alert template
2017-05-10 15:30:10 +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
73b8ff0ddc
Merge branch 'master' into dev-2.0
2017-04-27 10:19:55 +02: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
8c768f2ca3
web: Fix federation for instance label
2017-04-05 14:53:34 +02:00
8ffc851147
Merge branch 'master' into dev-2.0
2017-04-04 15:17:56 +02:00
bbcf20ba01
web: deduplicate series in federation
2017-04-04 11:20:23 +02:00
f56644e3ae
api/v1: deduplicate selected series
2017-04-04 11:09:11 +02: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
d42e01b07c
Sort labelnames for federation.
...
This makes unittests with multiple labels possible,
and may be needed for performance with the new
ingestion text parser.
2017-03-30 06:48:48 +01:00
dbb65846f1
Add unittest for federation external_labels behaviour
2017-03-30 06:48:48 +01:00
397f001ac5
Merge branch 'master' into dev-2.0
2017-03-20 14:12:11 +01:00
107c33545b
Don't truncate build version
2017-03-19 18:37:23 +01:00
c389193b37
Merge branch 'master' into dev-2.0
2017-03-17 16:27:07 +01:00
1823ae8bc4
Fixed int64 overflow for timestamp in v1/api parseDuration and parseTime ( #2501 )
...
* Fixed int64 overflow for timestamp in v1/api parseDuration and parseTime
This led to unexpected results on wrong query with "(...)&start=148966367200.372&end=1489667272.372"
That query is wrong because of `start > end` but actually internal int64 overflow caused start to be something around MinInt64 (huge negative value) and was passing validation.
BTW: Not sure if negative timestamp makes sense even.. But model.Earliest is actually MinInt64, can someone explain me why?
Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
* Added missing trailing periods on comments.
Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
* MOved to only `<` and `>`. Removed equal.
Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
2017-03-16 15:16:20 +01:00
de1e4322d7
Merge pull request #2474 from Gouthamve/custom-timeouts-1399
...
Support Custom Timeout for Queries
2017-03-12 14:20:59 +01:00
90625b0400
Use revision as cachebuster
2017-03-07 18:03:52 +03:00
4b0270290b
Fix comments to match convention
2017-03-06 23:21:27 +05:30
Fabian Reinartz
Julius Volz
Alexey Palazhchenko
Goutham Veeramachaneni
Frederic Branczyk
Brian Brazil
conorbroderick
Tom Wilkie
David Symonds
Conor Broderick
Tom Wilkie
Brian Brazil
Julius Volz
Bplotka
Erdem Agaoglu