2d0b8e8b94
Merge branch 'master' into dev-2.0
2017-10-05 13:09:18 +02: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
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
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
87918f3097
Merge branch 'master' into dev-2.0
2017-09-04 14:09:21 +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
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
25f3e1c424
Merge branch 'master' into mergemaster
2017-08-10 17:04:25 +02: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
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
dba7586671
Merge branch 'master' into dev-2.0
2017-07-11 17:22:14 +02:00
b6f89a1982
Parse custom step parameter correctly. ( #2928 )
...
Backport of 6a767b736b#2827 , #2861 .
2017-07-10 21:05:40 +02:00
13006feb1e
Fix alert label display in /alerts UI
2017-07-08 11:42:13 +02:00
e1fc9dc78d
Move /rules to new format ( #2901 )
...
Fixes #2891
Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
2017-07-08 11:38:02 +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
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
5ff283a7b7
Reflect the grouping in the UI
...
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-06-14 16:09:14 +05:30
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
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
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
9a9211845e
ui: fix alert template
2017-05-10 15:30:10 +02: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
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
8ffc851147
Merge branch 'master' into dev-2.0
2017-04-04 15:17:56 +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
397f001ac5
Merge branch 'master' into dev-2.0
2017-03-20 14:12:11 +01:00
c389193b37
Merge branch 'master' into dev-2.0
2017-03-17 16:27:07 +01:00
241da87f7f
Adding version to names of static files
...
to prevent browsers using old files in local caches after an upgrade.
2017-03-03 23:36:06 +03:00
9304179ef7
Merge branch 'master' into dev-2.0
2017-03-02 08:16:58 +01:00
Fabian Reinartz
beorn7
Takahito Yamatoya
Richard Hartmann
Karsten Weiss
Roman Khavronenko
Martín Ferrari
Alexey Palazhchenko
Julius Volz
Goutham Veeramachaneni
Alin Sinpalean
Julius Volz
Brian Brazil
conorbroderick
Frederic Branczyk
David Symonds
Conor Broderick
Brian Brazil
Erdem Agaoglu