6edd6c8f03
add with_credentials to datasource model
2015-12-09 14:44:28 +09:00
d1ccf83236
(cloudwatch) use paging
2015-12-06 21:35:20 +09:00
2aabb387b1
fix EC2RoleProvider parameter
2015-11-26 16:01:33 +09:00
f972863f49
add credential setting to handleDescribeInstances
2015-11-26 13:21:38 +09:00
5559ad1238
Return correct updated+created timestamps to frontend
2015-11-21 05:03:00 -08:00
7db38c80fc
Merge branch 'aws-sdk-go' of https://github.com/mischief/grafana into mischief-aws-sdk-go
2015-11-18 17:16:42 +01:00
f0087c93b8
fix(admin settings view): always censor provider_config for system info view, fixes #3268
2015-11-18 15:55:45 +01:00
79313aa268
Merge pull request #3253 from mtanda/cloudwatch_ecs
...
(cloudwatch) support ECS suggestion
2015-11-17 14:00:31 +01:00
f5db9950f8
fixed gofmt tests
2015-11-16 07:28:38 -08:00
9485e8cfee
/api/admin/users returns user ID
2015-11-16 06:55:02 -08:00
22b139d9f8
(cloudwatch) support ECS suggestion
2015-11-16 23:21:43 +09:00
32f9f8fcce
fix(http api): correct return status code for /api/datasources/:id so it eturns 404 when not found, fixes #3217
2015-11-13 09:43:25 +01:00
02a37d670c
sort namespaces by alphabetical order
2015-11-11 14:23:43 +09:00
a7deca1df5
sort regions by alphabetical order
2015-11-11 14:23:38 +09:00
5d8a51c307
Merge pull request #3129 from utkarshcmu/validity
...
Default AWS Region selection from dropdown
2015-11-09 22:25:30 +01:00
6325635fce
Corrected the frontend filename
2015-11-09 12:31:35 -08:00
7612e47aee
Select AWS region from dropdown
2015-11-09 12:08:40 -08:00
f55e24cd12
Added missing AWS Regions
2015-11-09 00:28:16 -08:00
b0cb6d6d4c
pkg/api/cloudwatch: fix api client construction against aws-sdk-go v0.10.2
2015-11-07 18:17:05 -08:00
5d64568f3e
refactoring: some minor refactoring and changes to AWS profile PR #3053
2015-10-29 11:44:34 +01:00
23599814a3
cloudwatch: add support for defining AWS profile for CloudWatch datasource
...
Add support for defining AWS profile for CloudWatch datasource to support
pulling information from multiple different AWS accounts to single dashboard.
With this change, it is possible to define multiple AWS credentials in
~/.aws/credentials file and connect different data sources to different
AWS accounts.
2015-10-27 17:00:02 +02:00
09b3433e32
change(dashboards): made home dashboard and json file dashboards editable unless otherwise specified in json file, closes #2567
2015-10-26 18:54:32 +01:00
da7ae2b0ab
fix(build/aws): updated aws dependency and fixed minor build issue, fixes #3026
2015-10-26 12:48:30 +01:00
6fecb4bf3e
fix(http route): fixed dashboard-solo route to not return 404, fixes #2979
2015-10-20 10:02:56 -04:00
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
