 bergquist
|
b7147a8bd2
|
docs(changelog): add prometheus annotation support
|
2016-02-09 10:27:43 +01:00 |
|
|
Carl Bergquist
|
f4e90df406
|
Merge pull request #3472 from mtanda/prometheus_query_template
(prometheus) templating by query result
|
2016-02-09 08:26:52 +01:00 |
|
 Mitsuhiro Tanda
|
2cce057df1
|
(prometheus) add query result template query
|
2016-02-09 01:37:43 +09:00 |
|
 Torkel Ödegaard
|
dea2234b14
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-02-08 16:57:41 +01:00 |
|
|
Torkel Ödegaard
|
99a053bbdd
|
feat(): removed unused routes and minor fixes
|
2016-02-08 16:57:29 +01:00 |
|
|
bergquist
|
b7fd6bcf7d
|
docs(changelog): add update about fixed height legend
|
2016-02-08 14:53:29 +01:00 |
|
|
Carl Bergquist
|
a3b6efdbfa
|
Merge pull request #2883 from mtanda/prometheus_annotation_support
Prometheus annotation support
|
2016-02-08 14:51:59 +01:00 |
|
|
Torkel Ödegaard
|
3a1dff6636
|
fix(): karma now works again, broken in last commit
|
2016-02-08 14:39:57 +01:00 |
|
|
Torkel Ödegaard
|
cf92011fb9
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-02-08 14:35:45 +01:00 |
|
|
Torkel Ödegaard
|
0106033293
|
refactor(): removed stuff
|
2016-02-08 14:35:34 +01:00 |
|
|
Carl Bergquist
|
4a43cc1df6
|
Merge pull request #3958 from bergquist/ux_login
Login: UX improvements
|
2016-02-08 13:05:05 +01:00 |
|
|
bergquist
|
0f52b4397f
|
feat(login): minor ux improvements
make buttons bigger and introduce the login divider.
closes #3698
|
2016-02-08 11:18:41 +01:00 |
|
|
Torkel Ödegaard
|
9c0da733e8
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-02-08 10:31:36 +01:00 |
|
|
Torkel Ödegaard
|
de90ad8967
|
feat(influxdb): escape influxdb tag values, fixes #3950
|
2016-02-08 10:31:26 +01:00 |
|
|
bergquist
|
2f3d1ec2ef
|
Merge branch 'graph_legend_height'
|
2016-02-08 10:07:53 +01:00 |
|
|
bergquist
|
73bed3880f
|
feat(graph): sets fixed height for right side legend
closes #1277
|
2016-02-08 09:49:53 +01:00 |
|
|
bergquist
|
edebdb166e
|
fix(graph): add missing ctrl in variable
|
2016-02-08 09:24:30 +01:00 |
|
|
Torkel Ödegaard
|
7f83be3d0d
|
ux(): mini fix!
|
2016-02-08 09:06:28 +01:00 |
|
|
Torkel Ödegaard
|
a5d1e9ee43
|
fix(singlestat): fix for singlestat background and sparklines, fixes #3955
|
2016-02-07 18:37:07 +01:00 |
|
|
Torkel Ödegaard
|
ff4dbea19d
|
ux(navbar): worked on responsive breakpoints for navbar
|
2016-02-07 12:28:06 +01:00 |
|
|
Torkel Ödegaard
|
89ef019b7c
|
fix(): back to dashboard link fix
|
2016-02-06 10:32:07 +01:00 |
|
|
Torkel Ödegaard
|
801129530e
|
feat(plugins): base clases are now in app/plugins/sdk
|
2016-02-05 18:08:21 +01:00 |
|
|
bergquist
|
23fa5fa1c7
|
Merge branch 'influxdb_global_interval'
|
2016-02-05 15:13:27 +01:00 |
|
|
bergquist
|
020277c045
|
style(panel): fix intendention issue
|
2016-02-05 15:10:55 +01:00 |
|
|
bergquist
|
f8b3c0a64c
|
feat(influxdb): add default interval setting
closes #1552
|
2016-02-05 15:10:33 +01:00 |
|
|
Carl Bergquist
|
d03ae3bfe5
|
Merge pull request #3944 from doubledutch/github-api-url
Add github api_url to github auth docs
|
2016-02-05 14:13:17 +01:00 |
|
|
bergquist
|
6f9896c2fe
|
docs(contributing): minor updates to old doc
|
2016-02-05 13:59:16 +01:00 |
|
|
Torkel Ödegaard
|
853cd16336
|
fix(search); fixes to dashboard search (using keyboard), and fix for singlestat in snapshot view
|
2016-02-05 13:48:10 +01:00 |
|
|
Torkel Ödegaard
|
0fab210ad2
|
feat(apps): changed edit apps view to use plugin-component for apps config view
|
2016-02-05 12:13:59 +01:00 |
|
|
Torkel Ödegaard
|
9fc0a83b83
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-02-05 11:08:44 +01:00 |
|
|
Torkel Ödegaard
|
aa8bd044c5
|
fix(): various fixes to snapshots
|
2016-02-05 11:05:47 +01:00 |
|
|
Carl Bergquist
|
59cb429d2d
|
Merge pull request #3949 from bergquist/table_panel_thresholds
tablepanel: using two thresholds
|
2016-02-05 10:38:31 +01:00 |
|
|
Torkel Ödegaard
|
454ccb451b
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-02-05 10:37:23 +01:00 |
|
|
Torkel Ödegaard
|
273fbaac68
|
refactor(): minor changes
|
2016-02-05 10:37:14 +01:00 |
|
|
bergquist
|
8ff997594f
|
fix(tablepanel): change to using two thresholds
fixes #3878
|
2016-02-05 10:30:46 +01:00 |
|
|
Carl Bergquist
|
a6c736b8a2
|
Merge pull request #3947 from utkarshcmu/route-fix
Fixed snapshot route
|
2016-02-05 09:51:00 +01:00 |
|
|
Carl Bergquist
|
5b02d63c89
|
Merge pull request #3948 from utkarshcmu/changelog
Added snapshot UI feature in Changelog
|
2016-02-05 09:50:30 +01:00 |
|
 utkarshcmu
|
c1fc8995ce
|
Added snapshot UI feature in Changelog
|
2016-02-05 00:41:54 -08:00 |
|
|
utkarshcmu
|
34f261588f
|
Fixed snapshot route
|
2016-02-05 00:35:02 -08:00 |
|
|
Torkel Ödegaard
|
f188900379
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-02-05 08:50:31 +01:00 |
|
|
Torkel Ödegaard
|
f80d5f8c03
|
refactor(): minor refactor
|
2016-02-05 08:50:15 +01:00 |
|
 Torkel Ödegaard
|
fcc960e9a2
|
Merge pull request #3792 from utkarshcmu/snapshot-view
UI Review: Snapshot view
|
2016-02-05 08:49:23 +01:00 |
|
|
Torkel Ödegaard
|
db27bbb162
|
Merge pull request #3918 from utkarshcmu/metadata
Added metadata fields under Settings tab
|
2016-02-05 08:47:57 +01:00 |
|
|
Torkel Ödegaard
|
1bce8f6669
|
Merge pull request #3736 from mtanda/cloudwatch_custom_metrics_alpha
(cloudwatch) custom metrics support
|
2016-02-05 08:44:50 +01:00 |
|
 Kevin Pike
|
15fb56e607
|
Add github api_url to github auth docs
|
2016-02-04 13:46:02 -08:00 |
|
|
Torkel Ödegaard
|
714129c8e3
|
fix(): package.json use local grunt in postinstall script
|
2016-02-04 22:44:25 +01:00 |
|
|
utkarshcmu
|
59a384b453
|
Merge branch 'master' of https://github.com/grafana/grafana into metadata
|
2016-02-04 13:34:32 -08:00 |
|
|
utkarshcmu
|
b5a5b7b912
|
Removed totalStats from PR
|
2016-02-04 13:34:23 -08:00 |
|
|
Torkel Ödegaard
|
a167eb4fa1
|
fix(row repeat): fix for row repeat where repeated row was added to the bottom and not next to the source row, fixes #2942
|
2016-02-04 22:33:53 +01:00 |
|
|
Torkel Ödegaard
|
660ce3a61d
|
fix(row editor): row editor fix and cleanup of unused code
|
2016-02-04 22:19:46 +01:00 |
|