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
0a04b135ca
Merge pull request #3158 from dthapa/master
...
use [auth.github] -> api_url property; supports git enterprise
2015-11-09 10:12:57 +01:00
f55e24cd12
Added missing AWS Regions
2015-11-09 00:28:16 -08:00
b345c7cf46
gofmt happiness
2015-11-07 11:32:06 -06:00
fe2d8f1ea0
Used dialect for postgres
2015-11-07 05:21:22 -08:00
e16bbc660d
use [auth.github] -> api_url property; supports git enterprise
2015-11-07 00:06:15 -06:00
2676f24e0a
Fixed user deletion in Postgres SQL
2015-11-06 20:17:27 -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
323e84375b
refactoring: minor refactoring and handling of known data source plugins
2015-10-26 16:37:45 +01:00
da3d5375b8
feat(ldap): refactoring of PR #2928 updated docs
2015-10-26 16:21:03 +01:00
38bd0d1aec
Merge branch 'ldap-improvements' of https://github.com/abligh/grafana into abligh-ldap-improvements
2015-10-26 15:56:21 +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
e8256f0ad7
Add support for POSIX LDAP schema
...
In the POSIX LDAP schema, there is no 'memberOf' attribute returned
in relation to which groups a person is a member of. Rather, it is
necessary to query the group objects which have the people as members.
This commit adds an additional filter, which if specified explicitly
searches for groups, rather than relying on the 'memberOf' attribute.
This enables Grafana to work with LDAP POSIX schema (e.g. OpenLDAP
etc.)
Signed-off-by: Alex Bligh <alex@alex.org.uk >
2015-10-13 19:51:59 +01:00
458e6da700
Allow user specified CA certs
...
Signed-off-by: Alex Bligh <alex@alex.org.uk >
2015-10-13 19:47:24 +01:00
a906fa178a
Support multiple space-separated LDAP hosts
...
Signed-off-by: Alex Bligh <alex@alex.org.uk >
2015-10-13 19:46:53 +01:00
e873574e8c
fix(logging): fixed so that router_logging = true actually logs all http requests, fixes #2902
2015-10-10 17:55:15 -04:00
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
9fc91b7aa1
fixed gofmt issue
2015-10-08 17:30:13 +02:00
fe46410c31
Merge branch 'cloudwatch'
2015-10-08 13:09:27 +02:00
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
182e079d25
Merge branch 'master' into cloudwatch
2015-10-06 14:08:10 +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
d37e18fdcf
Add config option to strip (most) colors from console logs
2015-10-01 13:16:23 -07:00
3cc69112c1
Fix "Link to Prometheus" button for proxied Prometheus sources.
2015-10-01 18:23:29 +02:00
057b533a39
Merge branch 'master' into cloudwatch
2015-10-01 16:46:59 +02:00
c816ed2527
feat(usage stats): added data source count stats
2015-09-29 13:47:56 +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
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
feae4c6c8b
fix(ldap): fixed syncing of email and name from ldap, fixes #2765
2015-09-21 09:02:52 +02:00
a23217cc6f
fix(influxdb): clear existing Authorization header when proxying request to InfluxDB, fixes #2778
2015-09-19 12:32:35 +02:00
5e949b0564
fix(quota): fixed failing quota unit tests
2015-09-18 08:36:58 +02:00
f9cd942363
Merge branch 'master' of github.com:grafana/grafana
2015-09-16 15:17:57 +02:00
10c099a52d
Fixed 404 error for robots.txt
2015-09-16 11:02:50 +10:00
fa0542ca8b
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
2015-09-15 14:33:21 +02:00
3926226417
fix getting default quota as map[string]int64
2015-09-15 20:31:58 +08:00
6a30511fc4
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
2015-09-15 14:23:13 +02:00
1ad10914ce
add quota middleware unittests
2015-09-15 18:19:47 +08:00
86ed85aa6e
move toMap function to be a method on the quota structs
2015-09-15 17:18:26 +08:00
b7de847236
add unittests for quota sqltore methods.
2015-09-15 17:10:46 +08:00
3cf2cd4684
be sure to pass result obj by reference to xorm.
2015-09-15 17:10:16 +08:00
64973f1d57
fix(settings): another attempt at fixing, #2736
2015-09-14 15:54:35 +02:00
Torkel Ödegaard
utkarshcmu
Don Thapa
Don
Jari Sukanen
Alex Bligh
ctdk
Julius Volz
Mitsuhiro Tanda
Elliot Anderson
woodsaj