9fc91b7aa1
fixed gofmt issue
2015-10-08 17:30:13 +02:00
fe46410c31
Merge branch 'cloudwatch'
2015-10-08 13:09:27 +02:00
3d52095765
feat(cloudwatch): restored dimension keys lookup
2015-10-02 20:25:28 +02:00
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
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
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
3cc69112c1
Fix "Link to Prometheus" button for proxied Prometheus sources.
2015-10-01 18:23:29 +02:00
9ae6ac25f5
refactor dataproxy_cloudwatch
2015-09-26 02:33:53 +09:00
9600b1f103
add ebs_volume_ids() for templating
2015-09-26 02:33:51 +09:00
a23217cc6f
fix(influxdb): clear existing Authorization header when proxying request to InfluxDB, fixes #2778
2015-09-19 12:32:35 +02:00
3926226417
fix getting default quota as map[string]int64
2015-09-15 20:31:58 +08:00
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
47bf1bd21a
return 404 when quotas not enabled.
2015-09-11 01:51:12 +08:00
852f9bd277
refactor quota settings
2015-09-11 01:47:33 +08:00
555cbeffa5
allow all users to retrieve org and quota data.
2015-09-11 01:18:36 +08:00
3d4d822528
implement updateQuota function
2015-09-11 01:04:29 +08:00
76e9ebde36
always return after errors.
2015-09-11 01:03:58 +08:00
0688050552
add quota middleware to enforce quotas. issue #321
...
Conflicts:
pkg/api/api.go
2015-09-11 01:03:47 +08:00
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
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
9603dce469
feat(dataproxy): added whitelist setting and feature for data proxies, closes #2626
2015-09-09 17:21:25 +02:00
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
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
3ed63d09d9
Merge branch 'master' into cloudwatch
2015-09-01 17:25:36 +02:00
aa89416bca
fix(invite): fixes to org invite stuff, #2630
2015-09-01 12:35:06 +02:00
ffbf70af25
Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch
2015-08-31 15:45:49 +02:00
d19e101e6b
feat(signup): almost done with new sign up flow, #2353
2015-08-31 11:35:07 +02:00
14884d5a2b
feat(signup): progress on new signup flow, #2353
2015-08-30 18:56:53 +02:00
de0f04ec3c
feat(signup): progress on new sign up and email verification flow, #2353
2015-08-28 15:14:24 +02:00
24dfa55465
feat(signup): progress on new sign up and email verification flow, #2353
2015-08-28 09:24:30 +02:00
d25624a8ad
feat(signup): began work on new / alternate signup flow that includes email verification, #2353
2015-08-27 13:59:58 +02:00
3d37c9c9a3
feat(tagmanager): support to add google tagmanager id, closes #2569
2015-08-21 09:30:39 +02:00
00f76ecaf6
CloudWatch proxy support
2015-08-20 00:51:23 +09:00
50281f12b9
fix(default datasource): minor fix for handling of default datasource
2015-08-18 14:54:56 +02:00
9a9c9b2b12
Merge branch 'query-editor-breakout'
...
Conflicts:
CHANGELOG.md
2015-08-18 08:23:13 +02:00
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
4a6b5274bc
feat(invite): fixes for org invite enhancement story, #2353
2015-08-17 10:55:52 +02:00
a16c63a43e
feat(mixed datasources): continued work on editor design change
2015-08-16 20:52:30 +02:00
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
43ef9f909a
feat(admin): admin page for all grafana organizations (list / edit view), #2457
2015-08-11 15:20:50 +02:00
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
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
74932e6311
feat(invite): added specific email for invites to existing grafana users
2015-08-11 10:35:10 +02:00
e53c1e39d3
feat(invite): can now add org user with sername again, #2353
2015-08-10 14:03:08 +02:00
775e044e69
feat(invite): progress on invite feature, #2353
2015-08-10 13:47:06 +02:00
19f64bc561
fix(data source proxy): clear proxies request from cookies, fixes #2470
2015-08-10 12:11:18 +02:00
0ed4744a33
influxdb(auth): fixed issue with using basic auth and influxdb, fixes #2455
2015-08-07 11:02:32 +02:00
9d25d2674b
fix(invite): fixed link in email
2015-08-04 20:23:04 +02:00
5a160f426e
feat(invite): trying to get username to work as well
2015-07-29 09:30:23 +02:00
6d6af09296
feat(invite): handling of existing org user case when inviting, #2353
2015-07-21 12:18:11 +02:00
