Torkel Ödegaard
f9cd942363
Merge branch 'master' of github.com:grafana/grafana
2015-09-16 15:17:57 +02:00
Elliot Anderson
10c099a52d
Fixed 404 error for robots.txt
2015-09-16 11:02:50 +10:00
Torkel Ödegaard
fa0542ca8b
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
2015-09-15 14:33:21 +02:00
woodsaj
3926226417
fix getting default quota as map[string]int64
2015-09-15 20:31:58 +08:00
Torkel Ödegaard
6a30511fc4
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
2015-09-15 14:23:13 +02:00
woodsaj
1ad10914ce
add quota middleware unittests
2015-09-15 18:19:47 +08:00
woodsaj
86ed85aa6e
move toMap function to be a method on the quota structs
2015-09-15 17:18:26 +08:00
woodsaj
b7de847236
add unittests for quota sqltore methods.
2015-09-15 17:10:46 +08:00
woodsaj
3cf2cd4684
be sure to pass result obj by reference to xorm.
2015-09-15 17:10:16 +08:00
Torkel Ödegaard
64973f1d57
fix(settings): another attempt at fixing, #2736
2015-09-14 15:54:35 +02:00
Torkel Ödegaard
d7bfb727b0
fix(settings): reverted prev settings fix for detecting public_gen folder in dev, caused issue for prod build
2015-09-14 13:42:23 +02:00
Torkel Ödegaard
37ad58c69e
fix(gofmt): somehow api.go did not pass gofmt test
2015-09-14 12:30:30 +02:00
Torkel Ödegaard
d17f8538b2
fix(backend): made public_gen detection more bullet proof, #2731
2015-09-13 15:23:23 +02:00
Torkel Ödegaard
9db6f82628
refactor: finished timepicker to typescript and directive refactor
2015-09-12 12:52:50 +02:00
woodsaj
6488324cf1
enhance quota support.
...
now includes:
- perOrg (users, dashboards, datasources, api_keys)
- perUser (orgs)
- global (users, orgs, dashboards, datasources, api_keys, sessions)
2015-09-11 23:17:10 +08:00
Torkel Ödegaard
8174b9f041
fix(tests): fixed failling backend test
2015-09-11 08:58:45 +02:00
Torkel Ödegaard
fb9e91e486
Merge branch 'master' of github.com:grafana/grafana
2015-09-11 08:13:49 +02:00
Torkel Ödegaard
286b4c0e46
Merge branch 'typescript'
2015-09-11 08:01:11 +02:00
woodsaj
47bf1bd21a
return 404 when quotas not enabled.
2015-09-11 01:51:12 +08:00
woodsaj
852f9bd277
refactor quota settings
2015-09-11 01:47:33 +08:00
woodsaj
555cbeffa5
allow all users to retrieve org and quota data.
2015-09-11 01:18:36 +08:00
woodsaj
3d4d822528
implement updateQuota function
2015-09-11 01:04:29 +08:00
woodsaj
c238130842
quote table names passed by arguments
2015-09-11 01:04:22 +08:00
woodsaj
76e9ebde36
always return after errors.
2015-09-11 01:03:58 +08:00
woodsaj
0688050552
add quota middleware to enforce quotas. issue #321
...
Conflicts:
pkg/api/api.go
2015-09-11 01:03:47 +08:00
woodsaj
9023171940
inital backend suport for quotas. issue #321
...
Conflicts:
conf/defaults.ini
main.go
pkg/services/sqlstore/migrations/migrations.go
2015-09-11 01:01:36 +08:00
Mehdi Abaakouk
6e532231dc
Fix dataproxy_test.go tests
...
This change fix dataproxy_test.go tests that was failing with:
pkg/api/dataproxy_test.go:17: not enough arguments in call to NewReverseProxy
pkg/api/dataproxy_test.go:39: not enough arguments in call to NewReverseProxy
FAIL _/home/ubuntu/grafana/pkg/api [build failed]
2015-09-10 13:27:49 +00:00
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
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
