woodsaj
437b957be1
remove external_plugin from models package.
2015-11-11 17:45:38 +08:00
woodsaj
d503c5d83d
refer to plugins are ExternalPlugin instead of thirdParty
2015-11-11 14:30:07 +08:00
Anthony Woods
cf89b565a6
initial import of thirdParty route support
2015-10-15 04:14:09 +08:00
ctdk
d37e18fdcf
Add config option to strip (most) colors from console logs
2015-10-01 13:16:23 -07:00
Torkel Ödegaard
c816ed2527
feat(usage stats): added data source count stats
2015-09-29 13:47:56 +02:00
Torkel Ödegaard
7f1af24318
fix(ldap): fixed ldap org roles sync, did only add one new role per login, now all roles are added, fixes #2766
2015-09-21 09:19:50 +02:00
Torkel Ödegaard
feae4c6c8b
fix(ldap): fixed syncing of email and name from ldap, fixes #2765
2015-09-21 09:02:52 +02:00
Torkel Ödegaard
a23217cc6f
fix(influxdb): clear existing Authorization header when proxying request to InfluxDB, fixes #2778
2015-09-19 12:32:35 +02:00
Torkel Ödegaard
5e949b0564
fix(quota): fixed failing quota unit tests
2015-09-18 08:36:58 +02:00
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
