Torkel Ödegaard
e873574e8c
fix(logging): fixed so that router_logging = true actually logs all http requests, fixes #2902
2015-10-10 17:55:15 -04:00
Torkel Ödegaard
c831369974
fix(influxdb): influxdb data source did not use right http abstraction for metric queries, fixes #2919
2015-10-10 11:46:00 -04:00
Torkel Ödegaard
9fc91b7aa1
fixed gofmt issue
2015-10-08 17:30:13 +02:00
Torkel Ödegaard
fe46410c31
Merge branch 'cloudwatch'
2015-10-08 13:09:27 +02:00
Torkel Ödegaard
106fe4854f
Merge branch 'prometheus' of github.com:grafana/grafana
...
Conflicts:
pkg/models/datasource.go
public/app/plugins/datasource/prometheus/datasource.js
public/app/plugins/datasource/prometheus/partials/query.editor.html
public/app/plugins/datasource/prometheus/queryCtrl.js
2015-10-06 16:36:58 +02:00
Torkel Ödegaard
182e079d25
Merge branch 'master' into cloudwatch
2015-10-06 14:08:10 +02:00
Torkel Ödegaard
3d52095765
feat(cloudwatch): restored dimension keys lookup
2015-10-02 20:25:28 +02:00
Torkel Ödegaard
0912cec0e5
feat(cloudwatch): contining work on moving hard coded stuff to backend and cleaning up code, #684
2015-10-02 11:54:35 +02:00
Torkel Ödegaard
180ba33ac8
feat(cloudwatch): refactoring and cleanup of backend code, started moving hard coded stuff in the frontend to the backend, changed name of metricFind queries region() -> regions() , and namespace() -> namespaces() to be more consistent with the others, #684
2015-10-02 11:10:21 +02:00
Torkel Ödegaard
04f4454974
feat(cloudwatch): lots of code refactoring and cleanup, #684 , dimension values lookup works but seems to return all dimension values no matter what dimension key you select, removed strange formating of template dimension values query, should not return key value pair but only the dimension value
2015-10-02 09:04:46 +02:00
ctdk
d37e18fdcf
Add config option to strip (most) colors from console logs
2015-10-01 13:16:23 -07:00
Julius Volz
3cc69112c1
Fix "Link to Prometheus" button for proxied Prometheus sources.
2015-10-01 18:23:29 +02:00
Torkel Ödegaard
057b533a39
Merge branch 'master' into cloudwatch
2015-10-01 16:46:59 +02:00
Torkel Ödegaard
c816ed2527
feat(usage stats): added data source count stats
2015-09-29 13:47:56 +02:00
Mitsuhiro Tanda
9ae6ac25f5
refactor dataproxy_cloudwatch
2015-09-26 02:33:53 +09:00
Mitsuhiro Tanda
9600b1f103
add ebs_volume_ids() for templating
2015-09-26 02:33:51 +09: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
