IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,436 Commits 5,454 Branches 554 Tags 1.9 GiB
dc427d5a2c
Commit Graph

725 Commits

Author SHA1 Message Date
Torkel Ödegaard
0b5f40e66c tech(): made config system check for generated css or javascript files and panic if there are none, also if there is a public_gen directory it will use that, even if static root is set to public 2015-09-10 13:34:32 +02:00
Torkel Ödegaard
9603dce469 feat(dataproxy): added whitelist setting and feature for data proxies, closes #2626 2015-09-09 17:21:25 +02:00
Torkel Ödegaard
e2cb66f8d7 fix(logging): removed temp dev logging code 2015-09-08 14:32:25 +02:00
Torkel Ödegaard
fad1d4cf98 feat(organization): added update org address to http api and to org details settings view, closes #2672 2015-09-08 14:22:44 +02:00
Torkel Ödegaard
daf64421f2 fix(api): Added error handling to create and update org http apis and sql update handlers, now checks for org name taken scenarios and returns correct http error code and message, fixes #2686 2015-09-08 13:06:18 +02:00
Torkel Ödegaard
fa3329271d fix(email notifications): added error handling to email template parsing, fixes #2690 2015-09-08 10:57:47 +02:00
Torkel Ödegaard
fdcb4473af fix(api auth): return 401 for authentication errors and 403 for access denied errors, fixes #2693 2015-09-08 10:46:31 +02:00
Torkel Ödegaard
9e1a9723c2 Merge branch 'cloudwatch' into elastic_ds 2015-09-02 15:25:45 +02:00
Torkel Ödegaard
d56e7787f2 Merge pull request #2637 from matschaffer/env-var-output-fix 
Iterate over the right env override list variable
 2015-09-02 11:32:49 +02:00
Torkel Ödegaard
3ed63d09d9 Merge branch 'master' into cloudwatch 2015-09-01 17:25:36 +02:00
Torkel Ödegaard
aa89416bca fix(invite): fixes to org invite stuff, #2630 2015-09-01 12:35:06 +02:00
Mat Schaffer
6c04ee1abd Iterate over the right env override list variable 2015-09-01 11:11:54 +09:00
Torkel Ödegaard
ffbf70af25 Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch 2015-08-31 15:45:49 +02:00
Torkel Ödegaard
99bb9d4fcf feat(signup): added back the welcome on signup completed email 2015-08-31 11:42:12 +02:00
Torkel Ödegaard
d19e101e6b feat(signup): almost done with new sign up flow, #2353 2015-08-31 11:35:07 +02:00
Torkel Ödegaard
14884d5a2b feat(signup): progress on new signup flow, #2353 2015-08-30 18:56:53 +02:00
Torkel Ödegaard
de0f04ec3c feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 15:14:24 +02:00
Torkel Ödegaard
c61b22cefb feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 13:45:16 +02:00
Torkel Ödegaard
24dfa55465 feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 09:24:30 +02:00
Torkel Ödegaard
d25624a8ad feat(signup): began work on new / alternate signup flow that includes email verification, #2353 2015-08-27 13:59:58 +02:00
Torkel Ödegaard
ca5e8c73d7 logging(ldap): added more logging to bind failures, #2588 2015-08-24 11:47:22 +02:00
Torkel Ödegaard
3d37c9c9a3 feat(tagmanager): support to add google tagmanager id, closes #2569 2015-08-21 09:30:39 +02:00
Torkel Ödegaard
7072af7c14 fix(auth proxy): Fix for server side rendering of panel when using auth proxy, fixes #2568 2015-08-21 07:49:49 +02:00
Haneysmith, Nathan
235bbc9c7e custom login hints via config file 2015-08-20 11:15:36 -07:00
Mitsuhiro Tanda
00f76ecaf6 CloudWatch proxy support 2015-08-20 00:51:23 +09:00
Torkel Ödegaard
01d9849e44 fix(user create): fixed for creating multiple users with empty email when auto assign org is set to false, fixes #2011 2015-08-18 20:15:24 +02:00
Torkel Ödegaard
50281f12b9 fix(default datasource): minor fix for handling of default datasource 2015-08-18 14:54:56 +02:00
Torkel Ödegaard
9a9c9b2b12 Merge branch 'query-editor-breakout' 
Conflicts:
	CHANGELOG.md
 2015-08-18 08:23:13 +02:00
Torkel Ödegaard
6ee0f2c6a7 feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required, #436 2015-08-17 17:07:33 +02:00
Torkel Ödegaard
4a6b5274bc feat(invite): fixes for org invite enhancement story, #2353 2015-08-17 10:55:52 +02:00
woodsaj
c138f390ac close all existing loggers before re-initilizing loggers. fixes #2533 2015-08-17 15:59:40 +08:00
Torkel Ödegaard
a16c63a43e feat(mixed datasources): continued work on editor design change 2015-08-16 20:52:30 +02:00
Torkel Ödegaard
16fa5c4df3 fix(mysql): fix for migration in newly added temp_user table, fixes #2509 2015-08-14 09:41:07 +02:00
Torkel Ödegaard
e6d09b3266 fix(db): remove stars and tags when removing user or dashboard, fixes #2016 2015-08-12 09:23:46 +02:00
Torkel Ödegaard
8fcaa4997d feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457 2015-08-12 08:59:39 +02:00
Torkel Ödegaard
43ef9f909a feat(admin): admin page for all grafana organizations (list / edit view), #2457 2015-08-11 15:20:50 +02:00
Torkel Ödegaard
e01c68dcea fix(logging): removed db connection string from being printed in logs at app startup, fixes #2488 2015-08-11 11:26:28 +02:00
Torkel Ödegaard
234d1291f9 Merge branch 'invite' 
Conflicts:
	public/css/less/gfbox.less
	public/emails/reset_password.html
	public/emails/welcome_on_signup.html
 2015-08-11 11:22:43 +02:00
Torkel Ödegaard
1ea0b5371a feat(invite): new user invites are now also added to correct org after sign up is completed, #2353 2015-08-11 10:45:03 +02:00
Torkel Ödegaard
74932e6311 feat(invite): added specific email for invites to existing grafana users 2015-08-11 10:35:10 +02:00
Torkel Ödegaard
835fd383ad fix(postgres): Dashboard search is now case insensitive when using Postgres, fixes #1896 2015-08-10 20:25:01 +02:00
Torkel Ödegaard
e53c1e39d3 feat(invite): can now add org user with sername again, #2353 2015-08-10 14:03:08 +02:00
Torkel Ödegaard
775e044e69 feat(invite): progress on invite feature, #2353 2015-08-10 13:47:06 +02:00
Torkel Ödegaard
19f64bc561 fix(data source proxy): clear proxies request from cookies, fixes #2470 2015-08-10 12:11:18 +02:00
Mark Bell
e59ea1aa02 Change log file permissions from 0660 to 0644 2015-08-08 23:06:30 -04:00
Torkel Ödegaard
1f7ac11baa feat(ldap): added support for compound search filter expressions, closes #2472 2015-08-08 10:00:49 +02:00
Torkel Ödegaard
0ed4744a33 influxdb(auth): fixed issue with using basic auth and influxdb, fixes #2455 2015-08-07 11:02:32 +02:00
Torkel Ödegaard
90400bf5ad fix(ldap): fix for ldap users with empty email address, fixes #2461 2015-08-07 10:14:36 +02:00
Brandon Turner
1e2e65b40d
Allow default org role to be Read Only Editor 2015-08-05 23:04:47 -05:00
Torkel Ödegaard
f62d743407 fix(ldap): another fix for ldap and empty bindDN and bind password, #2339 2015-08-05 16:34:39 +02:00
Torkel Ödegaard
9dc779927b fix(ldap): updated to ldap bindDN and bindPassword is allowed to be empty, fixes #2439 2015-08-05 16:28:15 +02:00
Torkel Ödegaard
9d25d2674b fix(invite): fixed link in email 2015-08-04 20:23:04 +02:00
Torkel Ödegaard
6d6c9b782b fix(ldap): minor fixes, should not have any real impact, #2421 2015-08-01 10:30:05 +02:00
Torkel Ödegaard
50895c7e37 fix(ldap): fixed issue with ldap group to grafana org role syncing, #1450 2015-07-31 16:38:41 +02:00
Torkel Ödegaard
5a160f426e feat(invite): trying to get username to work as well 2015-07-29 09:30:23 +02:00
Dieter Plaetinck
0f7a77f45b fix unknown key error formatting 2015-07-24 12:29:03 +02:00
Torkel Ödegaard
6d6af09296 feat(invite): handling of existing org user case when inviting, #2353 2015-07-21 12:18:11 +02:00
Torkel Ödegaard
ab54971763 feat(invite): more progress on completing invite form and actually creating a real user, #2353 2015-07-20 17:46:48 +02:00
Torkel Ödegaard
d75f96fdd5 feat(invite): more progress on invited / sigup view, #2353 2015-07-20 15:52:49 +02:00
Torkel Ödegaard
024c112944 feat(invite): redesign for pending invite list, added revoke button and link, copy invite also works now, #2353 2015-07-20 14:26:49 +02:00
Torkel Ödegaard
3242354a4b feat(invite): worked on pending invitations list, revoke invite now works, #2353 2015-07-20 10:57:39 +02:00
Torkel Ödegaard
4ac652b127 feat(invite): began work on invited signup view, also added backdrop to login view, #2353 2015-07-19 12:34:03 +02:00
Torkel Ödegaard
6088f83408 feat(invite): inital pass on sending new user invite email, #2353 2015-07-18 17:39:12 +02:00
Torkel Ödegaard
e92f2ecea1 feat(invite): existing grafana users now result in new org user directly, no temp user is created, #2353 2015-07-18 11:43:34 +02:00
Torkel Ödegaard
a82aa8203b Merge branch 'master' into invite 2015-07-18 10:14:45 +02:00
Torkel Ödegaard
9bf9bb0273 fix(ldap): fixed issue with ldap group mappings to org roles sync, #1450 2015-07-18 09:55:21 +02:00
Torkel Ödegaard
2724cf5db8 feat(invite): small progress 2015-07-17 14:42:49 +02:00
Torkel Ödegaard
0ffcce1b5d feat(invite): more work on invite, basic creation works, added new tab directive from angular-ui and made new tab style, #2353 2015-07-17 09:51:34 +02:00
Torkel Ödegaard
444807c35b feat(invite): worked on db & domain model for temp users, #2353 2015-07-16 17:59:11 +02:00
Torkel Ödegaard
5b0585ac7f feat(ldap): removed ssl_server_name and added some validation to ldap config, #1450 2015-07-16 12:58:30 +02:00
Torkel Ödegaard
9afdea8d2a feat(ldap): added config options for ssl skip verify, and ssl server name, #1450 2015-07-16 11:59:26 +02:00
Torkel Ödegaard
0b5ba55131 feat(ldap): work on reading ldap config from toml file, #1450 2015-07-15 10:08:23 +02:00
Torkel Ödegaard
262a09bb2d feat(ldap): added support for binding initially with an admin user searching for user and then binding again to authenticate current user, #1450 2015-07-14 17:35:11 +02:00
Torkel Ödegaard
0320baeb5b feat(ldap): user org role sync working 2015-07-14 16:42:55 +02:00
Torkel Ödegaard
42670c27d5 feat(ldap): more work on org role sync 2015-07-14 15:46:11 +02:00
Torkel Ödegaard
fe41a4e6fa feat(ldap): began work on org role sync 2015-07-14 14:29:07 +02:00
Torkel Ödegaard
a7b1df34c5 feat(ldap): more unit tests for ldap to grafana user sync 2015-07-14 10:20:30 +02:00
Torkel Ödegaard
2fa9311eee Progress on ldap support, #1450 2015-07-13 16:45:47 +02:00
Torkel Ödegaard
14f439f8ba refactor(ldap): refactoring ldap code, #1450 2015-07-13 15:37:25 +02:00
Torkel Ödegaard
bfe7b77313 More work on ldap auth, got memberOf working in the docker ldap test server, playing with config options and structures, #1450 2015-07-13 14:23:59 +02:00
Torkel Ödegaard
db1847bc1d More work on ldap, gotten ldap search (read attributes) to work 2015-07-10 15:29:34 +02:00
Torkel Ödegaard
0ef7271326 Started work on LDAP again, #1450 2015-07-10 11:10:48 +02:00
Dieter Plaetinck
66ba19b7ba clearer errors 
"Not found" should only be for http path/method not found (404)
if it's about specific resources, we should be explicit for clarity
 2015-07-08 08:55:31 +02:00
Torkel Ödegaard
aedaae852b Fixed minor mistake in last commit 2015-06-30 12:14:13 +02:00
Torkel Ödegaard
ae0f8c77d1 Auth: You can now authenicate against api with username / password using basic auth, Closes #2218 2015-06-30 09:37:52 +02:00
Torkel Ödegaard
d0e7d53c69 Fixed case insensitive search for file based dashboards, Fixes #2258 2015-06-30 08:17:28 +02:00
Torkel Ödegaard
647e43dcbd Merge pull request #2259 from donnpebe/fix 
Fix wrong metrics counter
 2015-06-30 08:07:04 +02:00
Torkel Ödegaard
0d856cc135 Error message for missing dashboards.json config section, Closes #2256 2015-06-30 08:05:05 +02:00
Donn Pebe
df33cbc8c5 Fix wrong metrics counter 2015-06-30 12:52:55 +07:00
Dieter Plaetinck
194273a643 clarify which handler is not found 2015-06-26 12:32:24 -07:00
Torkel Ödegaard
24bab47f14 fix(create org): Anonymous user can no longer create org, Fixes #2227 2015-06-25 17:06:43 +02:00
Torkel Ödegaard
3f917b0af5 Updated org creation view, after creating new org user is switched to that org and redirect to org details view, Closes #2198 2015-06-22 08:13:21 +02:00
Torkel Ödegaard
fb7b475457 Backend: Load dashboards with capital letters in the dashboard url slug (url id), Fixes #2163 2015-06-19 14:42:55 -04:00
Torkel Ödegaard
26e5d7a3de Graph: fixed PNG rendering of panels with legend table to the right, #2185 2015-06-19 14:13:25 -04:00
Anthony Woods
196b7846cc add support for robots.txt file 2015-06-15 19:02:38 -04:00
Torkel Ödegaard
311946900e Fixed email subject test 2015-06-14 06:08:18 +02:00
Torkel Ödegaard
9b12350855 Added support for templated email subjects 2015-06-14 06:07:36 +02:00
Torkel Ödegaard
66e60357dc Set email when creating user from auth_proxy header, Fixes #2156 2015-06-13 20:14:44 +02:00
Torkel Ödegaard
bae1e2f0c1 Fix for validating tags in dashboard json in backend, Fixes #2152 2015-06-12 09:04:10 +02:00
Torkel Ödegaard
7ce31bfaa0 changed dependency for gosimple/slug, they had finally removed the gopkgs dependency, Fixes #2153 2015-06-12 08:53:20 +02:00
Torkel Ödegaard
3675b3fcaa Fixed issue with clearing admin permissions, Fixes #2143 2015-06-11 08:29:12 +02:00
Torkel Ödegaard
5962bcbc6c Do not show create org link when allow_org_create is set to false, Fixes #2135 2015-06-11 08:16:09 +02:00
Torkel Ödegaard
b5418c40ba fixed AMPQ -> AMQP typo 2015-06-10 14:44:42 +02:00
Torkel Ödegaard
2266ef6809 Minor api refactoring / code clean up 2015-06-10 10:15:42 +02:00
Torkel Ödegaard
bb2d810709 Final work password reset email, Closes #1456 2015-06-08 18:25:04 +02:00
Torkel Ödegaard
db0c442eaf Added configuration options for smtp 2015-06-08 17:56:56 +02:00
Torkel Ödegaard
42fc68baa5 Simplified emailing system and combined mailer and notifications packages 2015-06-08 16:51:25 +02:00
Torkel Ödegaard
c8bc0b3bf8 Lots of work on user password reset, #1456 2015-06-08 13:39:02 +02:00
Torkel Ödegaard
aa4d60c21e Worked on reset password views, refactored out password strength to a reusable directive 2015-06-08 10:57:01 +02:00
Torkel Ödegaard
89418a155a More work on email and notification infra #1456 2015-06-05 11:08:19 +02:00
Torkel Ödegaard
c709a28f02 More work on email and notification infra #1456 2015-06-05 08:15:38 +02:00
Torkel Ödegaard
3706d0dedd More work on email and notification infra #1456 2015-06-04 17:23:46 +02:00
Torkel Ödegaard
3f5ab189cd Began work on emailing service #1456 2015-06-04 14:29:39 +02:00
Torkel Ödegaard
eb793f7feb Initial work on ldap support, #1450 2015-06-04 09:34:42 +02:00
Torkel Ödegaard
2c7d33cdfa Merge branch 'master' into ldap 2015-06-03 14:54:48 +02:00
Torkel Ödegaard
83279604c6 updated search handler 2015-06-03 14:53:52 +02:00
Torkel Ödegaard
50a1feb90a Dashboard list panel: Now supports search by multiple tags, Closes #2096 2015-06-02 11:04:06 +02:00
Torkel Ödegaard
dc607b8e8a Dashboard search now supports filtering by multiple dashboard tags, Closes #2095 2015-06-02 10:24:20 +02:00
Torkel Ödegaard
2446168356 Sort tags in search results, Closes #2091 2015-06-02 09:00:37 +02:00
Torkel Ödegaard
ff3843bc7f Roles: New user role that replaces the old role behavior, Closes #2088 2015-06-01 17:01:04 +02:00
Torkel Ödegaard
85c3a0aa14 Panel menu now hides edit actions for users with role Viewer, Closes #1826 2015-06-01 16:36:15 +02:00
Torkel Ödegaard
e2f6633d57 Began work on data source test / validation, #1997 & #2043 2015-06-01 12:15:49 +02:00
Torkel Ödegaard
fc43ce657c allow data source proxy to proxy requests over self signed https connections, Closes #2069 2015-06-01 11:00:29 +02:00
Andrea Bernardo Ciddio
cf147cdeaf GitHub users without a public email should be authenticated using their primary private email address 2015-05-28 16:47:20 +01:00
Torkel Ödegaard
5f004f95f2 Fixed issue with json dashboard index, json file dashboards turned up when filtering on 'is starred' 2015-05-25 15:42:59 +02:00
Torkel Ödegaard
abed438d7d Merge pull request #2052 from indrekj/org-support 
Add github organizations support
 2015-05-25 14:16:46 +02:00
Brandon Turner
b2a0ae0f83
Render panel images with any SSL protocol 
This uses any available SSL protocol (instead the phantomjs default:
SSLv3) to render panels to PNGs.  This is useful when reverse proxing
grafana and SSLv3 is disabled due to security vulnerabilities or other
reasons.
 2015-05-25 01:52:49 -05:00
Indrek Juhkam
b55d9350e7 Add github organizations support 2015-05-23 17:06:51 +03:00
Torkel Ödegaard
592330b5a7 Expose data source extended properties (jsonData), to the frontend, Closes #2023 2015-05-20 18:29:20 +02:00
Torkel Ödegaard
3354365177 Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling 2015-05-20 14:59:38 +02:00
Torkel Ödegaard
51af06edf7 Merge pull request #2022 from dalmatinerdb/proxy-url-fix 
fixing #2021
 2015-05-20 09:03:23 +02:00
Heinz N. Gies
7cf9046dc5 fixing #2021 
This tiny commit fixes a routing problem for proxy requests. The
router was expecting a url path behind the proxy id, if none was
given (read: the service proxied was at the root of a host) then
the router would return a 404. With this patch it now propperly
uses ProxyDataSourceRequest.
 2015-05-19 23:49:30 +02:00
Torkel Ödegaard
a8aab0cb2b Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014 2015-05-19 11:47:14 +02:00
Torkel Ödegaard
788e7fd36d Lots of api refactoring for org routes, #2014 2015-05-19 10:16:32 +02:00
Torkel Ödegaard
74bf1f23fb Small progress on #2014 2015-05-19 09:09:21 +02:00
Torkel Ödegaard
bf9e51928d Fix to signed in user when user <-> org link is gone 2015-05-19 09:02:37 +02:00
Torkel Ödegaard
f81bde5643 Refactoring some api handlers to use the new Response return object 2015-05-18 21:23:40 +02:00
Torkel Ödegaard
fbc6bb2112 More refactoring of user http api, trying to reuse handlers for sign in user and admin operations 2015-05-18 19:06:19 +02:00
Torkel Ödegaard
5270c4bc74 refactorin api code for user routes, preparation for admin improvements, #2014 2015-05-18 17:52:23 +02:00
Dieter Plaetinck
e9f38b9fc0 no unbound recursion in publish() 
unbound recursion approach can blow up call stack,
and - I think - allocate memory unboundedly as well.

We can simply loop until err != nil

I didn't actually test this live, though tests succeed
 2015-05-18 10:04:01 -04:00
Haneysmith, Nathan
2af28b90c2 whitespace update per gofmt 2015-05-15 13:25:41 -07:00
Haneysmith, Nathan
09b0e6e388 Addresses #1853, redact session provider secrets 
In cases where a database is used for session storage, redact the
session_provider config value. I assumed "@" as the marker for a
database vs file/memory.
 2015-05-15 11:11:02 -07:00
Torkel Ödegaard
ea993b6404 Some inital ldap work 2015-05-15 09:37:16 +02:00
Torkel Ödegaard
1c9993f185 Backend configuration: When unknown key was detected the log error was not visible in log file due to logging was initialized after user config file is loaded, logging is now initialized twice, once based on defaults and command line arguments, then then again after user config file, Fixes #1992 2015-05-14 10:15:46 +02:00
Torkel Ödegaard
1a401780ba Updated changelog with completed story, JSON dashboards added to search, Closes #960 2015-05-13 14:01:48 +02:00
Torkel Ödegaard
448a8b8d1c Major refactorings around searching, moved to seperate package, trying to move stuff out of models package, extend search support searching different types of entities and different types of dashboards, #960 2015-05-13 13:36:24 +02:00
Torkel Ödegaard
c8146e759f Fixed json index unit test 2015-05-13 10:57:18 +02:00
Torkel Ödegaard
bb7d79e6d2 Refactoring search to support more than just db dashboards 2015-05-13 10:45:53 +02:00
Torkel Ödegaard
fb35f7210c Fixed failing golang test 2015-05-13 10:06:06 +02:00
Torkel Ödegaard
187834b17c Trying to get dashboard loading and dashboard meta flags like canSave, canStar more managable 2015-05-13 09:58:45 +02:00
Torkel Ödegaard
35cc0a1cc0 Rewriting anb abstracting how dashboards are loaded, unifying db, json files, and script dashboards, #960 2015-05-12 17:39:56 +02:00
Torkel Ödegaard
b3be51f17f Lots of work on search and dashboard loading, trying to generalize concepts and code, #960 2015-05-12 14:11:30 +02:00
Torkel Ödegaard
a40299b4dc Progress on json file index and search #960 2015-05-12 12:20:03 +02:00
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
Torkel Ödegaard
6911572fa1 Panel image rendering: now works under self-signed https cert, Fixes #1726 2015-04-08 09:06:01 +02:00
Torkel Ödegaard
059db533d5 HTTP API: grafana /render calls nows with api keys, Fixes #1649 2015-04-08 08:59:12 +02:00
Torkel Ödegaard
c07d48d930 A big refactoring for how sessions are handled, Api calls that authenticate with api key will no longer create a new session 2015-04-07 19:21:14 +02:00
Torkel Ödegaard
646298f5c5 Handle errors when loading dashboard with template variables that query data sources that cannot be found 2015-04-07 13:48:26 +02:00
Torkel Ödegaard
22adf0d06e Datasource proxy & session timeout fix (casued 401 Unauthorized error after a while), Fixes #1667 2015-04-07 09:25:00 +02:00
Torkel Ödegaard
eb575685aa OAuth: Specify allowed email address domains for google or and github oauth logins, Closes #1660 2015-04-06 14:16:22 +02:00
Torkel Ödegaard
b8c378f2f0 Updated golang/x/oauth2 dependency, #1710 2015-04-04 09:50:25 +02:00
Torkel Ödegaard
e6492f7db9 Share modal: Override UI theme via URL param for Share link, rendered panel, or embedded panel, Closes #1701 2015-04-02 09:21:38 +02:00
Torkel Ödegaard
a96e4a343c Only create admin user specified in config file when there are no users in the database, Fixes #1680 2015-04-01 16:05:42 +02:00
Torkel Ödegaard
1f330d7753 Basic auth: Fixed issue when using basic auth proxy infront of Grafana, Fixes #1673 2015-04-01 15:23:26 +02:00
Torkel Ödegaard
cf877e6567 added postgres and redis session options 2015-04-01 09:45:42 +02:00
Torkel Ödegaard
c3fa68ade8 Data source proxy: Fixed issue with Gzip enabled and data source proxy, Fixes #1675 2015-04-01 09:00:17 +02:00
Torkel Ödegaard
5422d13607 Postgres fix update 2015-04-01 08:26:02 +02:00
Torkel Ödegaard
d8f614ed98 Merge pull request #1665 from mattrobenolt/bool 
Let xorm convert `False` into the right type
 2015-04-01 08:25:20 +02:00
Torkel Ödegaard
3c2bfbfc1c Search: Dashboard results should be sorted alphabetically, Fixes #1685 2015-03-31 22:06:19 +02:00
Torkel Ödegaard
b83367063e Small improvement to dashboard loading error handling 2015-03-31 14:03:01 +02:00
Matt Robenolt
cedb11ebab Let xorm convert False into the right type 2015-03-30 18:11:39 -07:00
Torkel Ödegaard
b46f8bad6d Added check for allow_user_org_create, updated admin docs 2015-03-30 10:12:24 +02:00
Torkel Ödegaard
38db91c7be Fixed failing go unit test 2015-03-29 13:33:34 +02:00
Torkel Ödegaard
8e9a0eddf5 Custom snapshot topnav header, new custom dashboard snapshot icon, #1623 2015-03-28 17:53:52 +01:00
Torkel Ödegaard
80c771c945 Added googla analytics id setting 2015-03-27 17:13:44 +01:00
Torkel Ödegaard
f7b4f331f3 Updating docs 2015-03-27 14:23:23 +01:00
Torkel Ödegaard
d3db49ae3e Fixed snapshot sharing issue 2015-03-27 06:47:58 +01:00
Torkel Ödegaard
7be7aeb70a Fixed sql migration issue with dashboard snapshots 2015-03-26 21:20:44 +01:00
Torkel Ödegaard
541cd2e430 Dashboard snapshot: more work on snapshot deletion, and saving external reference, #1623 2015-03-26 20:59:41 +01:00
Torkel Ödegaard
4322f29f34 Dashboard snapshot: added delete key which can be used to delete snapshots, #1623 2015-03-26 20:34:58 +01:00
Torkel Ödegaard
71aa2ef2c2 Changed reporting interval to 24 hour (1 hour was just for testing) 2015-03-26 12:20:24 +01:00
Torkel Ödegaard
b1f85dc8f1 Added expire option to dashboard snapshots, #1623 2015-03-26 12:00:52 +01:00
Torkel Ödegaard
f4280ca517 More refinements of dashboard snapshot dialog, #1623 2015-03-25 20:36:48 +01:00
Torkel Ödegaard
afeb65b3bf Snapshot sharing fix 2015-03-25 17:18:43 +01:00
Torkel Ödegaard
aa60edd9fe Fixed issue with external snapshot publish 2015-03-25 16:30:03 +01:00
Torkel Ödegaard
cb3593e472 Lots of small fixes, role viewer hides save icon and some actions in 
config dropdown. Snapshot dashboard hides save, star, config menu icons.
Can now embedd panel from snapshotted dashboard.
 2015-03-25 15:48:56 +01:00
Torkel Ödegaard
10618637e2 Fixed bug in sql migration, closes #1643 2015-03-25 13:53:58 +01:00
Torkel Ödegaard
9268ecf3e9 Some refinements to dashboard snapshots 2015-03-25 09:04:38 +01:00
Matt Robenolt
5286f0856d Fix more Cache-Control headers 
`max-age` is always with an `=`, not a `:`.
 2015-03-24 17:30:26 -07:00
Torkel Ödegaard
7919d79347 Another cache header fix 2015-03-24 17:16:13 +01:00
Torkel Ödegaard
a5c3855233 Added dashboard snapshot metrics 2015-03-24 16:49:12 +01:00
Torkel Ödegaard
c27db7a347 Small updates to share dashboard snapshot feature 2015-03-24 15:46:17 +01:00
Matt Robenolt
3e9adeefbc Fix format of Cache-Control header 2015-03-23 21:58:29 -07:00
Torkel Ödegaard
5f0e7cd52a Added custom cache control headers for static content 2015-03-23 18:28:59 -04:00
Torkel Ödegaard
7614ddb318 Updated design for snapshot sharing dialog, #1596 2015-03-23 13:58:30 -04:00
Torkel Ödegaard
49a0ea53c7 Merge branch 'develop' of github.com:grafana/grafana into dashboard_snapshot_poc 
Conflicts:
	src/app/features/dashboard/partials/shareDashboard.html
 2015-03-22 22:04:13 -04:00
Torkel Ödegaard
44bc2b2d56 Updated conf description, metrics interval 2015-03-22 16:30:28 -04:00
Torkel Ödegaard
a26436f59b Server metrics fix 2015-03-22 16:13:16 -04:00
Torkel Ödegaard
1e4c62a70d updated server reporting 2015-03-22 15:45:13 -04:00
Torkel Ödegaard
9c9ebb4987 Updated server stats 2015-03-22 15:24:35 -04:00
Torkel Ödegaard
d987532262 Added server metrics 2015-03-22 15:14:00 -04:00