Torkel Ödegaard
18337f610d
Merge branch 'master' into develop
2017-09-22 08:42:07 +02:00
Torkel Ödegaard
491fa6cad8
tech: more tslint rules
2017-09-21 17:23:31 +02:00
Torkel Ödegaard
b8d9722b4f
tech: removing unused variables from typescript files, and making tslint rules more strict
2017-09-21 16:40:18 +02:00
Torkel Ödegaard
adda84d124
tech: removed test component
2017-09-21 14:05:24 +02:00
Torkel Ödegaard
837beda155
Merge branch 'react-poc'
2017-09-21 13:59:26 +02:00
Torkel Ödegaard
1887c4f279
singlestat: minor change
2017-09-21 13:59:21 +02:00
Patrick O'Carroll
de17dcf3b0
Singlestat time ( #9298 )
...
* Added a timestamp option to single stat
* can now choose last time as value
* Finished last_time so it formats correctly, updated value stat
* fixed som issues, but still issue with testing
* Clean up after fake clock in test
* timezone-issue fix, fake time for from now test
* fix for timedifference
2017-09-21 13:34:51 +02:00
Torkel Ödegaard
fed35909cc
tech: progress on react poc
2017-09-21 13:32:57 +02:00
Torkel Ödegaard
84b1519480
tech: initial react poc
2017-09-20 17:44:23 +02:00
Torkel Ödegaard
41e01184aa
Merge branch 'master' into develop
2017-09-18 12:32:29 +02:00
Andrew Prokhorenkov
00b18a8aea
addded mass units, #9265 ( #9273 )
2017-09-18 11:13:56 +02:00
Andrew Prokhorenkov
8cdf12b694
add locale format
2017-09-15 17:26:18 +02:00
Andrew Prokhorenkov
5b74bea476
add Ukrainian hryvnia sign
2017-09-14 19:06:25 +02:00
Torkel Ödegaard
a9e3130ef6
Merge branch 'master' into develop
2017-09-13 16:06:34 +02:00
Mitsuhiro Tanda
b349b3ef55
provide ace editor for external datasource plugin ( #9224 )
2017-09-13 09:29:53 +02:00
Torkel Ödegaard
f6100dd8eb
ux: success/error alerts refactoring, #9214
2017-09-12 09:05:32 +02:00
Patrick O'Carroll
90602942f5
New alert design ( #9214 )
...
* ux: updated alert design
* fixed bg-color for alerts
* more changes to alerts, index fixed
2017-09-12 08:01:44 +02:00
Torkel Ödegaard
e5f84484eb
prometheus: another prometheus syntax highlight fix, #9212 , #9167
2017-09-11 16:36:53 +02:00
Alexander Zobnin
b1580bf385
ace: fix braces highlight in prometheus ( #9212 )
2017-09-11 15:49:15 +02:00
Torkel Ödegaard
2953d64429
prometheus: minor update to focus editor PR, #9201
2017-09-08 11:43:29 +02:00
Torkel Ödegaard
4b851de648
Merge branch 'prom_give_focus' of https://github.com/mtanda/grafana into mtanda-prom_give_focus
2017-09-08 10:55:50 +02:00
Alin Sinpalean
1076b75a21
Fix rounding of intervals ( #9197 )
...
* Prometheus: Fix actual step computation logic when a min_step is specified and the range is longer than min_step * 11000.
* Fix kbn.round_interval for exact intervals.
* Remove redundant 1d return, fix a couple of comments.
* Be more cautious with values close to 1d not rounding up to 1d. They may, because of the way the calculation uses 2 potentially different current time values.
2017-09-08 10:37:57 +02:00
Mitsuhiro Tanda
7c566a6539
fix to focus first query
2017-09-08 12:33:36 +09:00
Mitsuhiro Tanda
d971eddc7a
copy from give-focus
2017-09-08 11:49:44 +09:00
Mitsuhiro Tanda
ce0de35a6c
set give focus in code editor
2017-09-08 11:49:41 +09:00
Torkel Ödegaard
a38ded9e7e
Merge branch 'master' into develop-newgrid-row-design2
2017-09-07 15:05:41 +02:00
Carl Bergquist
62979916ad
Merge pull request #8876 from mtanda/shortcut_new_dashboard
...
add new dashboard shortcut
2017-09-07 14:26:05 +02:00
Torkel Ödegaard
c9a30ef149
build: fixed broken build
2017-09-07 13:05:26 +02:00
Mitsuhiro Tanda
e98254e1e3
show only label name in label matcher ( #9167 )
2017-09-07 10:10:52 +02:00
Alin Sinpalean
5d4b8b5a5c
Have 'Hide series with only zeros' ignore nulls ( #9179 )
...
* Prometheus: Fix actual step computation logic when a min_step is specified and the range is longer than min_step * 11000.
* Have the 'Hide series with only zeros' option also apply to series with some null values.
2017-09-06 16:50:55 +02:00
Torkel Ödegaard
07e192ff47
change: more work on changing default group by time interval to min interval setting
2017-09-01 15:57:02 +02:00
Torkel Ödegaard
eb0f5cc900
ux: progress on metrics tab changes
2017-08-31 16:38:49 +02:00
Torkel Ödegaard
9b60a63778
ux: metrics tab v3
2017-08-30 16:39:00 +02:00
Torkel Ödegaard
dda1cf1a88
Merge branch 'ace-editor'
2017-08-29 15:52:03 +02:00
Torkel Ödegaard
bdb1cfb008
ace: minor fixes for ace editor
2017-08-29 15:51:54 +02:00
Torkel Ödegaard
bf110d02d1
fix: form dropdown, escape autocomplete dropdown items, fixes #9089
2017-08-28 11:00:42 +02:00
Alexander Zobnin
9375441991
ace: add default light theme
2017-08-26 13:46:39 +03:00
Alexander Zobnin
ef3c543620
ace: fix directive docs
2017-08-26 12:52:32 +03:00
Alexander Zobnin
54f932e960
ace: fix error when getCompleter() wasn't passed
2017-08-26 12:48:37 +03:00
Alexander Zobnin
451ecce4ab
ace: styles tweak
2017-08-26 12:36:08 +03:00
Torkel Ödegaard
ba1fbe0786
ux: alternative row design
2017-08-25 18:53:35 +02:00
Torkel Ödegaard
160d8cec92
grid: minor progres on new grid
2017-08-24 16:37:00 +02:00
Torkel Ödegaard
47cf8e6337
grid: minor progres on new grid
2017-08-24 14:08:05 +02:00
Alexander Zobnin
a0cb744746
ace: reduce docs lines width
2017-08-24 13:58:26 +03:00
Alexander Zobnin
dc7616e560
ace: prometheus functions docs
2017-08-24 13:56:22 +03:00
Alexander Zobnin
f7ec8e0de0
Merge branch 'master' into ace-editor
2017-08-24 12:37:18 +03:00
Daniel Lee
bf4ffe41b0
Merge branch 'v4.4.x'
2017-08-23 15:19:51 +02:00
Daniel Lee
e763104a6f
csv: add toggle for export to Excel
...
Adds back feature that adds 'sep=;' text that excel needs in a csv file.
Also adds toggle to make this optional if exporting to other spreadsheet
programs. Fixes #9083 .
2017-08-23 15:17:53 +02:00
Torkel Ödegaard
4f9fbcc211
dataproxy: added caching of datasources when doing data proxy requests, #9078
2017-08-23 13:31:26 +02:00
Daniel Lee
bbf9d7677b
Merge branch 'v4.4.x'
2017-08-21 21:05:43 +02:00
