public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,332 Commits 655 Branches 650 Tags
659a01903e3bf6963da17029cd2b4304f5554bd7
Commit Graph

11072 Commits

Author SHA1 Message Date
Torkel Ödegaard
1a9f630710 Began work on adding json files to search, #960 2015-05-11 20:04:03 +02:00
Torkel Ödegaard
34539c0c13 Enforce domain, host header validation against domain setting, Refactoring of PR #1866, Closes #1732 2015-05-05 11:21:06 +02:00
Torkel Ödegaard
1f2cba81eb Merge branch 'enforce-domain' of https://github.com/gummiboll/grafana 2015-05-05 11:15:09 +02:00
Torkel Ödegaard
e5c1169120 HTTP API: GET /api/dashboards/db/:slug response changed property to to match the POST request nameing, Fixes #1928 2015-05-04 08:36:44 +02:00
Torkel Ödegaard
38d851eb98 Another HTTP API fix 2015-05-04 08:19:29 +02:00
Torkel Ödegaard
73ee8a5985 HTTP API: fix for POST /api/dashboards/db returned 200 ok when dashboard was not found, Fixes #1929 2015-05-04 07:46:53 +02:00
Torkel Ödegaard
38fc85d619 Final tweaks to auth proxy feature 2015-05-02 12:30:53 +02:00
Torkel Ödegaard
be589d81c7 Auth: Support for user authentication via reverse proxy header (like X-Authenticated-User, or X-WEBAUTH-USER), Closes #1921 2015-05-02 12:06:58 +02:00
Torkel Ödegaard
ba883d25fe More middleware unit tests cover all current auth mechanisms 2015-05-02 09:24:56 +02:00
Torkel Ödegaard
f416e2d1ac More middleware unit test, starting to look really good 2015-05-01 22:26:16 +02:00
Torkel Ödegaard
cb8110cd48 Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921 2015-05-01 16:23:36 +02:00
Torkel Ödegaard
d1e9b6d6ae Began work on auth_proxy feature (#1932), and began work on testing http api, and auth middleware 2015-05-01 11:55:59 +02:00
Torkel Ödegaard
e771d8e944 Organization: You can now update the organization user role directly (without removing and readding the organization user). Closes #1899 2015-05-01 09:48:07 +02:00
Torkel Ödegaard
5de9230924 Security: New config option to disable the use of gravatar for profile images, Closes #1891 2015-05-01 08:40:13 +02:00
Torkel Ödegaard
0d3fbb8659 Added message alerts when login failed due to github team membership or email domain requirement, #1731, #1660 2015-04-29 10:08:01 +02:00
Torkel Ödegaard
884dc53f8a smalĺ refactorings 2015-04-29 09:49:33 +02:00
Torkel Ödegaard
d812414621 Merge branch 'github-team-membership-requirement' of https://github.com/dewski/grafana into dewski-github-team-membership-requirement 2015-04-29 09:44:23 +02:00
Torkel Ödegaard
e7c43bf614 expose org id to frontend, Closes #1907 2015-04-29 09:26:12 +02:00
Garrett Bjerkhoel
1d7f945268 Handle special error case if connect.UserInfo returns an error 2015-04-28 20:22:45 -07:00
Garrett Bjerkhoel
eb37fc089b Check for active team membership when fetching s.UserInfo 2015-04-28 20:22:21 -07:00
Garrett Bjerkhoel
979d0ca70f Add new error type for team membership permissions 2015-04-28 20:21:44 -07:00
Garrett Bjerkhoel
7ea579bb71 Add team_ids configuration option 2015-04-28 20:19:48 -07:00
Torkel Ödegaard
af277f560f Merge branch 'master' into editable_false 2015-04-27 08:53:57 +02:00
Torkel Ödegaard
e410fbb558 Corrected SQL migration for snapshot table column type change, #1880 2015-04-25 20:28:50 +02:00
Anthony Woods
f227002a80 fixes #1880 dashboard_snapshot table does not have a data column 2015-04-25 18:51:25 +08:00
Anthony Woods
d84d92f73c fixes #1880 correct mysql statement for modifying column data type 2015-04-25 18:46:30 +08:00
Torkel Ödegaard
4fd2c0570c Replaced slug dependency with one that did not use gopkgs.com 2015-04-24 15:46:16 +02:00
Emil Thelin
2d7c7871b0 Fixes broken test 2015-04-23 20:56:31 +02:00
Emil Thelin
9fd3ef2687 Enforce domain 2015-04-23 20:38:00 +02:00
Torkel Ödegaard
b99ee2562e Restored sql integration tests to use in mem sqlite3 2015-04-23 16:21:49 +02:00
Torkel Ödegaard
8526025792 MySQL: Dashboard.data column type changed to mediumtext (sql migration added), Fixes #1863 2015-04-23 16:18:46 +02:00
Torkel Ödegaard
236c4e65f8 Began work on dashboard: editable flag, that actually stops users from changing anything, #1834 2015-04-23 15:26:48 +02:00
Torkel Odegaard
1edb13d715 Fixed gofmt formating 2015-04-19 09:29:08 +02:00
Torkel Ödegaard
aa8beda4ec Merge pull request #1800 from alienth/allowsignup 
Add allow_sign_up setting for auth.google/github.
 2015-04-19 09:16:48 +02:00
Torkel Odegaard
7178dcad35 Windows: Fixed runtime issue with file logging config that casued errors on startup 2015-04-19 09:14:50 +02:00
Jason Harvey
ddaac50a25 Add allow_sign_up override for auth.google/github. 2015-04-16 13:43:18 -08:00
Torkel Ödegaard
c54f0fe58b Merge pull request #1783 from williamjoy/master 
oauth google: read api_url from config file
 2015-04-16 08:15:31 +02:00
Torkel Ödegaard
fc47fb8f64 Backend auth: remember cookie is needed for oauth logins as well 2015-04-15 13:38:38 +02:00
Torkel Ödegaard
942e8fdba8 Support for unicode / international characters in dashboard title (improved slugify), Fixes #1734, Fixes #827 2015-04-15 12:36:02 +02:00
William Wei
b7c0d99cdf get google api url from config file 
instead of using https://www.googleapis.com/oauth2/v1/userinfo in
code.
 2015-04-15 18:11:54 +08:00
Torkel Ödegaard
836e4b4911 Dashboard snapshot: Should not require login to view snapshot, Fixes #1780 2015-04-15 10:39:03 +02:00
Torkel Ödegaard
e9afd30b47 Updated changelog with, Github OAuth: Now works with Github for Enterprise, thanks @williamjoy 2015-04-15 10:31:56 +02:00
William Wei
4fd2622e55 grafana/grafana#1781 add oauth api url as config 
read github api from config file instead of using public github:
http://api.github.com/user

this would be useful when you are using github enterprise edition
 2015-04-15 14:18:10 +08:00
William Wei
d048e39cde grafana/grafana#1781 add oauth api url as config 2015-04-15 14:03:28 +08:00
Torkel Ödegaard
6de584aafc Updated to config file finding, and added homepath command line option 2015-04-12 09:15:49 +02:00
Torkel Ödegaard
d32c03ed11 Rpm working again, systemd working on centos 7 2015-04-10 16:20:01 +02:00
Torkel Ödegaard
2020fedfdb Fixed issue with overriding default config values via command line 2015-04-10 10:58:32 +02:00
Torkel Ödegaard
d1767144a8 Reworking configuration loading and overriding 2015-04-09 12:16:59 +02:00
Torkel Ödegaard
a991cda233 Began work on refactoring reading config values 2015-04-08 20:31:42 +02:00
Torkel Ödegaard
96ee1c17a3 Worked on new deb & rpm packaging and init.d scripts 2015-04-08 14:10:04 +02:00