Commit Graph

6399 Commits

Author SHA1 Message Date
bergquist
ad9b2ab617 fix(impressionStorage): use title instead of slut
closes #4194
2016-02-29 19:51:35 +01:00
Torkel Ödegaard
cb8b038795 feat(templating): progress on templating rethink 2016-02-29 17:31:31 +01:00
Torkel Ödegaard
078e69d06d feat(templating): simplified templating forms removed all formats 2016-02-29 17:07:53 +01:00
bergquist
df8e56ddf8 docs(plugins): move plugins into seperate folder 2016-02-29 16:53:47 +01:00
Torkel Ödegaard
f44d6e063c Merge branch 'master' into variable-value-formatting-rethink 2016-02-29 16:42:25 +01:00
Torkel Ödegaard
113509a4e9 Merge branch 'master' of github.com:grafana/grafana 2016-02-29 16:41:36 +01:00
Torkel Ödegaard
839c675cb9 ux(): minor tweak 2016-02-29 16:38:45 +01:00
bergquist
854c360def Merge branch 'plopp-master' 2016-02-29 15:02:14 +01:00
bergquist
0cbb95ed1e fix(export_csv): rename export to csv label 2016-02-29 15:01:26 +01:00
bergquist
d8929b1d3e Merge branch 'master' of https://github.com/plopp/grafana into plopp-master 2016-02-29 14:58:38 +01:00
Carl Bergquist
fa99a6745d Merge pull request #4192 from bergquist/last_viewed_dashboards
feat(dashlist): list last x viewed dashboards
2016-02-29 14:51:20 +01:00
bergquist
b79217be1e feat(impressionStore): remove un needed js-ts bridge 2016-02-29 14:37:09 +01:00
Torkel Ödegaard
d27a0f5b0c ux(): small ux fix for inspector modal 2016-02-29 14:35:55 +01:00
Torkel Ödegaard
97c27668bc fix(): fix failing build and removed panel icon from edit mode tabs 2016-02-29 14:15:46 +01:00
bergquist
e5970e83ff feat(dashlist): list last x viewed dashboards
closes #3896
2016-02-29 14:14:43 +01:00
Torkel Ödegaard
d3c022f89e Merge branch 'master' of github.com:grafana/grafana 2016-02-29 13:43:18 +01:00
Torkel Ödegaard
3624587f08 misc(): added elasticsearch.yml config file to docker test env 2016-02-29 13:42:55 +01:00
Torkel Ödegaard
56c080417a fix(logging): only log to xorm.log when in dev mode, fixes #4182 2016-02-29 13:42:07 +01:00
Torkel Ödegaard
da4e3784e9 Merge pull request #4190 from raintank/issue4185
fix app->plugin renamin in more places
2016-02-29 12:59:31 +01:00
Anthony Woods
35f7a71f9a fix app->plugin renamin in more places 2016-02-29 19:54:36 +08:00
Torkel Ödegaard
bf22b4cbfe Merge pull request #4189 from raintank/issue4185
correct path for app page links.
2016-02-29 12:50:13 +01:00
Anthony Woods
4741152f05 correct path for app page links. 2016-02-29 19:37:35 +08:00
bergquist
fb33cf4576 docs(changelog): add info about templated timeshift 2016-02-29 11:14:24 +01:00
Carl Bergquist
1fb38abf6b Merge pull request #4063 from mtanda/timeshift_template
timeFrom and timeShift templating
2016-02-29 11:11:45 +01:00
bergquist
4299feee37 feat(templates): collapse submenu if none visable templates 2016-02-29 10:49:11 +01:00
bergquist
86b1906798 fix(templating): make checkboxes a new row 2016-02-29 10:29:40 +01:00
bergquist
18a0a85df6 Merge branch 'hide_template' of https://github.com/mtanda/grafana into mtanda-hide_template 2016-02-29 10:20:44 +01:00
bergquist
05ba32b552 feat(datasource): add type to datasource list
closes #4183
2016-02-29 10:18:50 +01:00
bergquist
c30c12d369 fix(single_stat): rounding bug in value => text 2016-02-29 10:05:41 +01:00
Mitsuhiro Tanda
09dfaf9875 timeFrom and timeShift templating 2016-02-29 17:53:41 +09:00
Torkel Ödegaard
ae604b6289 ux(annotations): minor polish to annotations editor 2016-02-29 09:50:40 +01:00
Anthony Woods
fc8146b53d Merge pull request #4187 from raintank/issue4185
replace 'app' with 'plugins' where needed.
2016-02-29 15:59:30 +08:00
Anthony Woods
641845519d replace 'app' with 'plugins' where needed. 2016-02-29 15:50:02 +08:00
Carl Bergquist
b32809d03f Merge pull request #4105 from benrubson/issue3982-2
Add some more steps for template auto interval
2016-02-29 08:49:27 +01:00
Carl Bergquist
02b2c7482a Merge pull request #4138 from utkarshcmu/tsdb-refac2
Opentsdb 2.2 support without breaking 2.1
2016-02-29 06:55:41 +01:00
Torkel Ödegaard
6fd0d5e267 Merge pull request #4178 from mtanda/prometheus_template_label
(prometheus) fix label_values() templating
2016-02-28 16:40:37 +01:00
benrubson
a4ecacb9b5 rebase against master 2016-02-28 15:32:34 +01:00
Torkel Ödegaard
b9e0fcdf85 Merge pull request #4103 from benrubson/issue3982
Add a minimum value option for template auto interval
2016-02-28 15:11:33 +01:00
Torkel Ödegaard
4ef79d250d feat(templating): initial work on rethink of value formating 2016-02-28 11:44:11 +01:00
utkarshcmu
18c57ea230 Made opentsdb query_ctrl robust 2016-02-28 01:50:50 -08:00
utkarshcmu
a883424d25 smooth upgrade from Grafana 2.6 to 3.0 2016-02-28 01:50:11 -08:00
utkarshcmu
7fa170cee9 Fixed the UI as per new UX convention 2016-02-28 01:50:10 -08:00
utkarshcmu
8925329950 Added default opentsdb version to datasource 2016-02-28 01:50:10 -08:00
utkarshcmu
4aa5dab62d Added query ctrl tests for Opentsdb 2016-02-28 01:50:10 -08:00
utkarshcmu
936dd2eaaa Added relevant docs and changes 2016-02-28 01:50:10 -08:00
utkarshcmu
09e80f0390 Labels fixed in legend for Filters 2016-02-28 01:49:34 -08:00
utkarshcmu
63dfa303e5 Datasource working with filters after fixing bugs 2016-02-28 01:49:34 -08:00
utkarshcmu
599b1eb689 Smooth transition from opentsdb 2.1 to 2.2 2016-02-28 01:49:34 -08:00
utkarshcmu
4a636b6da7 add, edit, remove filters functionality implemented 2016-02-28 01:49:34 -08:00
utkarshcmu
d92172f50c Added Filters UI 2016-02-28 01:49:34 -08:00