Carl Bergquist
184e7046df
Merge pull request #10059 from FunkyM/local-image-store
...
Add support for internal image store
2018-01-22 11:03:00 +01:00
bergquist
6780e00c7d
changelog: note about closing #9664
2018-01-22 10:47:23 +01:00
Carl Bergquist
89ae4d6685
Merge pull request #9664 from mtanda/prometheus_on_by
...
(prometheus) show label name in paren after by/without/on/ignoring/group_left/group_right
2018-01-22 10:42:20 +01:00
bergquist
9678be15d9
changelog: adds note about closing #9770
2018-01-22 08:16:31 +01:00
Carl Bergquist
27d103adae
Merge pull request #10574 from Jonnymcc/disable-mode-options-line-points-unchecked
...
Disable instead of hide mode options when line/points is unchecked
2018-01-22 08:11:19 +01:00
Carl Bergquist
397da7a444
Merge pull request #10572 from Jonnymcc/add-lumens-unit
...
Add lumens unit
2018-01-22 07:35:26 +01:00
Jonathan McCall
f516c82ddc
Disable instead of hide mode options when line/points is unchecked
2018-01-20 19:23:26 -05:00
Daniel Lee
94a54248c1
dashfolders: show folders use can save to in picker
...
Instead of returning all folders a user has some sort of access to,
this change creates a new end point that returns folders the user
has write access to. This new endpoint is used in the folder picker
2018-01-20 01:58:28 +01:00
Daniel Lee
f443cb8229
dashfolders: fix bug in save as modal
2018-01-20 01:58:28 +01:00
Jonathan McCall
88e1ec3382
Add lumens unit
2018-01-19 19:12:30 -05:00
Dan Cech
562aa58029
add docs for configuring OAuth with Auth0 and Azure AD
2018-01-19 14:00:17 -05:00
Carl Bergquist
1de00ded1e
Merge pull request #10556 from Ultimation/patch-1
...
Recommend a limit on database query for influxdb annotations
2018-01-19 13:49:29 +01:00
bergquist
278337e45a
install dep instead of govendor on setup
2018-01-19 10:27:02 +01:00
Carl Bergquist
987a546e74
Merge pull request #10563 from grafana/golang_dep
...
Migrated from govendor to dep
2018-01-19 10:22:54 +01:00
bergquist
7ed643f302
remove unused code from vendor
2018-01-19 09:54:22 +01:00
bergquist
e023f79c5a
migrate from govendor to dep
2018-01-19 09:48:15 +01:00
Torkel Ödegaard
4f59d229fe
fix: cloudwatch corrected error handling so original error is not thrown away
2018-01-19 09:24:44 +01:00
Dan Cech
a09044a45a
go fmt
2018-01-18 19:17:05 -05:00
Dan Cech
04e17c145f
support for decoding JWT id tokens
2018-01-18 18:25:58 -05:00
Torkel Ödegaard
4720b86f5c
Merge remote-tracking branch 'origin/mattttt-style-tweaks'
2018-01-18 19:18:34 +01:00
Torkel Ödegaard
2d192f6cc8
Merge branch 'dashboard_permissions' of github.com:grafana/grafana into dashboard_permissions
2018-01-18 18:24:17 +01:00
Torkel Ödegaard
cfa775e012
ds: updated ds nav
2018-01-18 18:17:58 +01:00
Torkel Ödegaard
dc3e943a4e
feat: ds edit fix
2018-01-18 17:43:41 +01:00
Torkel Ödegaard
ccde8d9e2f
feat: ds edit nav
2018-01-18 17:42:40 +01:00
Dan Cech
5bb22b836d
Generic Oauth Support for ADFS ( #9242 )
...
* check upn field if email address isn't present, support for adfs
* correctly set login to the user's email address if not specified by the oauth server
* break up GenericOAuth.UserInfo into helper functions
2018-01-18 17:24:04 +01:00
Andrew Cottrell
8368bfeab4
Recommend a limit on database query
...
Users not putting a limit on can end up causing bad performance. A recommended limit in the placehold is a quick little help.
2018-01-18 14:31:42 +00:00
Matt
0dffb6dbb1
Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside
2018-01-18 14:40:08 +01:00
Daniel Lee
f64637c2c5
dashfolders: stop user locking themselves out of a folder
2018-01-18 14:30:04 +01:00
Daniel Lee
10018d8455
dashfolders: add breadcrumbs to NavStore
2018-01-18 12:12:07 +01:00
Daniel Lee
1a019052d5
mysql: convert numbers to text for annotation tooltip
2018-01-18 11:50:16 +01:00
Daniel Lee
6d13645206
mysql: update to use ColumnTypes interface in new version
...
The custom code in vendor is not needed anymore and most of the
mapping code can be replaced.
2018-01-18 11:50:16 +01:00
Daniel Lee
7bc7af6c39
mysql: update mysql driver to latest master
...
The latest master implements the ColumnType interface.
See https://github.com/go-sql-driver/mysql/issues/495
This removes the custom code in the vendor folder that
did a ColumnType mapping.
2018-01-18 11:50:16 +01:00
bergquist
a32644198c
gofmt my dear friend
2018-01-18 11:49:45 +01:00
Torkel Ödegaard
7dc046d9f5
ux: updated react-layout-grid
2018-01-18 11:33:39 +01:00
Carl Bergquist
d6667c4fa0
Merge pull request #10548 from StevenTobin/follow_symlinks
...
Make file_reader follow symlinks
2018-01-18 11:29:34 +01:00
bergquist
b6e6935821
plugins: send secureJsonData unencrypted
2018-01-18 11:22:44 +01:00
Carl Bergquist
81bb3e1e27
Merge pull request #10547 from grafana/provisioning
...
Dashboard provisioning. Replace folder property with path
2018-01-18 10:05:19 +01:00
stobin
f1813ae3a3
Make file_reader follow symlinks
2018-01-17 14:51:17 +00:00
bergquist
34d7f8a44f
dashboards as cfg: property path replaces folder
2018-01-17 15:48:24 +01:00
bergquist
9e20004ec8
Merge branch 'plugin_lib'
...
* plugin_lib:
moves datasource plugin model to grafana/grafana_plugin_model
2018-01-17 13:47:36 +01:00
bergquist
a183ea97bb
moves datasource plugin model to grafana/grafana_plugin_model
2018-01-17 13:21:42 +01:00
Torkel Ödegaard
af9d1cc577
Update package.json
...
fixed duplicate dev dependency, closes #10542
2018-01-17 11:53:49 +01:00
Torkel Ödegaard
561561d8fe
fix: fixed build issue
2018-01-17 10:48:07 +01:00
Torkel Ödegaard
66edb29f53
fix: multi valued query variables did not work correctly, fixes #10539
2018-01-17 09:41:35 +01:00
Dan Cech
c62b0858ae
move graphite /functions parsing into gfunc.ts
2018-01-16 18:04:59 -05:00
Dan Cech
50ffe56b60
remove duplicate sass rules
2018-01-16 17:17:58 -05:00
Dan Cech
315ecf8505
fix tests & some display issues
2018-01-16 17:02:03 -05:00
Torkel Ödegaard
e9d33750cb
fix: graphite func editor fixes, this component is messy and ugly as hell
2018-01-16 17:02:03 -05:00
Torkel Ödegaard
1a6bf692c6
fix: minor fixes
2018-01-16 17:02:03 -05:00
Torkel Ödegaard
38f4d5d06d
fix: restored previous behavior of form_dropdown, this fixes all my observerd bugs with the dropdown behavior
2018-01-16 17:02:03 -05:00
