Commit Graph

12996 Commits

Author SHA1 Message Date
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
Torkel Ödegaard
7e750cef43
fix: query editor needs to wait for function definitions to load 2018-01-16 17:02:03 -05:00
Dan Cech
b483d42d34
fix issue with metric find & functions being loaded multiple times 2018-01-16 17:02:03 -05:00
Dan Cech
60ba6ee6a2
interpolate variables in tags & values during autocomplete 2018-01-16 17:02:03 -05:00
Dan Cech
92086bc858
fix typo 2018-01-16 17:02:03 -05:00
Dan Cech
1d00c3c72a
update rst2html 2018-01-16 17:02:03 -05:00
Dan Cech
da9e1a7e98
fix line length, run jscs & jshint in precommit 2018-01-16 17:02:03 -05:00
Dan Cech
3ddb65fc8b
function description formatting 2018-01-16 17:02:03 -05:00
Dan Cech
4d3bac0284
tooltips for function definitions 2018-01-16 17:02:03 -05:00
Dan Cech
80a6e0d8d1
support specifying tag_values("<tag>") as graphite template query 2018-01-16 17:02:03 -05:00
Dan Cech
7c1be021ac
use typeahead value in graphite find requests 2018-01-16 17:02:03 -05:00
Dan Cech
ff759b0ef7
send prefix when auto-completing tags 2018-01-16 17:02:03 -05:00
Dan Cech
d8f2a20775
add button to trigger evaluation of tag queries 2018-01-16 17:02:03 -05:00
Dan Cech
a3dba6070e
sync function categories with graphite-web 2018-01-16 17:02:03 -05:00
Dan Cech
ebad19b232
work on tag dropdown behavior 2018-01-16 17:02:03 -05:00
Dan Cech
3a4e05133e
support for loading function definitions from graphite 2018-01-16 17:02:03 -05:00
Torkel Ödegaard
c4c0e7934b
Update building_from_source.md
corrected build instructions, #10532
2018-01-16 20:15:52 +01:00
Torkel Ödegaard
94b0c79631
Update README.md
Simplified build instructions i
2018-01-16 20:14:53 +01:00