mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-08-23 15:41:00 +02:00
Code Issues Projects Releases Wiki Activity
4,042 Commits 291 Branches 481 Tags
Commit Graph

107 Commits

Author SHA1 Message Date
beorn7
16c95ae8e7 Merge branch 'release-1.7' 2017-09-21 18:27:12 +02:00
beorn7
dd381356a5 Tweak floating point number rendering 2017-09-19 18:53:00 +02:00
beorn7
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
Takahito Yamatoya
b1151bdabc ui changed, limit the number of digits for the larger units is 5 2017-09-19 11:11:39 +09:00
Takahito Yamatoya
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
beorn7
e7aab2791a Forward-merge bug fixes frem branch 'release-1.7' 2017-09-18 12:14:37 +02:00
beorn7
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
Takahito Yamatoya
5d707d3aa3 #2439 library version update JQuery / JQuery.Selection / JQuery.hotkey (#3183) 2017-09-18 11:45:57 +02:00
Takahito Yamatoya
ff038a4a39 bug fix 2017-09-17 00:20:39 +09:00
Takahito Yamatoya
7a3c348f83 fix decimal y-axis 2017-09-17 00:16:40 +09:00
Takahito Yamatoya
738a51bea6 #2371 fix to display utc date at datetime picker 2017-09-16 11:38:29 +09:00
beorn7
84211bd2df Foward-merge bug fixes and cherry-picks from 'release-1.7' 2017-09-15 13:44:22 +02:00
beorn7
a3fd7dd335 Backport the templating fix from master 
The original fix is in commit 5f5d77848e54a7995b13e8a463b9f1fd3fc6123e
 2017-09-14 18:12:00 +02:00
Richard Hartmann
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
Karsten Weiss
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
beorn7
6cf62fe8ba Update web/ui/bindata.go 2017-08-10 14:40:19 +02:00
Roman Khavronenko
245b8a0b37 Allow to collapse jobs at /targets page (#2628) 2017-08-09 17:10:30 +02:00
beorn7
3bb0667607 Merge branch 'release-1.7' 2017-07-21 19:40:30 +02:00
Martín Ferrari
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
Alexey Palazhchenko
b6f89a1982 Parse custom step parameter correctly. (#2928) 
Backport of 6a767b736be5cd4ddf72a8bc6024ac8115713e7d.
Refs #2827, #2861.
 2017-07-10 21:05:40 +02:00
Alin Sinpalean
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
Alexey Palazhchenko
6a767b736b Parse custom step parameter correctly. (#2861) 
Fixes #2827.
 2017-06-19 17:22:59 +01:00
Brian Brazil
d66799d7f3 Show gaps in graphs. (#2766) 
Fixes #345
 2017-05-26 16:17:48 +01:00
conorbroderick
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
Frederic Branczyk
45df5c2daf
Merge branch 'release-1.6' 2017-05-22 13:44:44 +02:00
conorbroderick
9287a01bbf Fixed fixed yaxis of stacked graph being cut off 2017-05-18 15:18:29 +01: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
Conor Broderick
9eb1a5d6bf Handle invalid query in graph UI (#2652) 2017-04-24 10:50:57 +01:00
Conor Broderick
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
Conor Broderick
c72692fd75 Fixed issue of partially hidden y-axis values on graph (#2589) 2017-04-06 16:04:44 +01:00
Brian Brazil
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
Conor Broderick
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
Erdem Agaoglu
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
Derek Marcotte
0a7fb56b16 Expose PromConsole.Graph.buildQueryUrl, refactor dispatch to use (#2461) 
Expose buildQueryUrl, refactor dispatch to use

buildQueryUrl will allow users to execute queries over the range of an
existing graph.  This will be helpful to select data series they wish to
annotate the graph with, for example.
 2017-03-01 22:37:50 +00:00
Julius Volz
7e14533b32 Merge pull request #2396 from lightpriest/fuzzy-fix-lookup 
Fix fuzzy search lookup issues
 2017-02-28 19:06:30 +01:00
Derek Marcotte
74a3b1051a Add rickshawGraph proerty to the Graph object. (#2438) 
Add rickshawGraph property to the Graph object.

This allows further changes to be made to the graph, for example,
annotations.
 2017-02-18 10:03:32 +00:00
Or Cohen
93d20d2d2b Improve fuzzy search 
The fuzzy library didn't try to find a "best match", but settled on the
first fuzzy match that exists. This patch includes a modified version of
the fuzzy library, which recursivley tries on the rest of the search
string to find a better match. If found, returns that one.

Another small modification is that if a pattern fully matches, it
skips the lookup entirley and returns the highest score possible for
that match.
 2017-02-05 17:38:05 +02:00
Or Cohen
81d37a04aa Fix autocomplete misses certain queries 
For some of the queries, the fuzzy lookup was not filtering properly.
The problem is due to the "replace" beind made on the query itself. It
accidently removes only the first underscore. This patch changes it so
that it removes all of the whitespaces, letting the fuzzy algorithm do
its magic, also fixing this problem.

Originally, the underscore were replaced by a space for this specific
reason, to let the user type a space and have the lookup treat it as the
word break.

Fixes #2380
 2017-02-05 16:20:52 +02:00
Harmen
135d32ea22 make assets 2016-12-27 13:59:20 +01:00
Harmen
dfa4f79bcd add favicon 2016-12-27 13:58:51 +01:00
Brian Brazil
bed4635802 Use irate consistently in console template examples. (#2296) 
I must have forgotten my 'g' when switching these.
 2016-12-21 13:19:23 +00:00
Brian Brazil
2e3b42ad6c Correctly handle the end time being 0 in the URL. (#2290) 2016-12-18 19:30:52 +00:00
Morten Siebuhr
c5b17263a6 web: Display current working directory on status-page 2016-12-05 19:46:41 +01:00
Frederic Branczyk
33b583d50e
web/api: add targets endpoint 2016-12-05 13:13:21 +01:00
Frederic Branczyk
8f8cea4fbd
retrieval: refactor TargetManager to return flat list of Targets 2016-12-02 13:28:58 +01:00
Fabian Reinartz
d4deb8bbf2 web: show discovered Alertmanagers in UI 2016-11-24 15:06:50 +01:00
Martín Ferrari
4298d91a9c Update bindata.go 2016-11-17 02:33:31 +00:00
Martín Ferrari
fe83ea511f Replace handlebars with the simpler and saner mustache library. 2016-11-17 02:33:12 +00:00
Martín Ferrari
0a6972b6a3 Replace datetimepicker library with a more maintained version. 
Adds also the moment.js library, which is a dependency of it.

Following conventions in the web/ui directory, I am not including the original
sources or LICENSE files.
 2016-11-17 02:29:08 +00:00
beorn7
5b16d6bd6e Merge branch 'release-1.2' 2016-10-31 00:06:23 +01:00