public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,126 Commits 655 Branches 650 Tags
280f9befaebd927dba67ddf52c8b6f7ebbbd434a
Commit Graph
627 Commits
Author SHA1 Message Date
Carl Bergquist 280f9befae Merge pull request #2949 from shoonoise/master 
Add option to hide raintank share button

Fixes #2727
 2015-12-14 17:29:09 +01:00
Carl Bergquist 548ee47aa7 Merge pull request #3122 from shoonoise/hide_signout 
Disable sign out button in case of auth proxy enabled
 2015-12-14 17:18:04 +01:00
Torkel Ödegaard b63471ebe9 fix(windows): exclude syslog feature from windows builds 2015-12-14 16:16:36 +01:00
Torkel Ödegaard c7e3ed096f fix(postgres): fixes db migration issue with_credentials column for postgres, fixes #3505 2015-12-14 10:19:53 +01:00
Carl Bergquist 4ee9e48e7c Merge pull request #3405 from piotr1212/master 
Add more info in route logging
 2015-12-11 16:23:59 +01:00
carl bergquist fab1062c0b Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints 
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go

closes #2571
closes #2494
 2015-12-11 15:16:57 +01:00
Carl Bergquist 225e7a6a32 Merge pull request #3161 from mischief/syslog 
syslog support closes #3160
 2015-12-11 14:03:21 +01:00
Mitsuhiro Tanda c8e894e8f8 sort metrics and dimensions 2015-12-11 17:56:35 +09:00
Mitsuhiro Tanda d9844350fe update supported metrics and dimensions 2015-12-11 17:42:40 +09:00
Mitsuhiro Tanda 2d9d11a89c reorder supported metrics and dimensions 2015-12-11 17:19:56 +09:00
Mitsuhiro Tanda 6edd6c8f03 add with_credentials to datasource model 2015-12-09 14:44:28 +09:00
Mitsuhiro Tanda d1ccf83236 (cloudwatch) use paging 2015-12-06 21:35:20 +09:00
Torkel Ödegaard 67dc761344 fix(security): do not print ENV config values when they are passwords, fixes #3337 2015-12-04 10:38:27 +01:00
Piotr Popieluch 207c1a20ee router logger, log username taken from cookie 2015-12-03 11:05:50 +01:00
Piotr Popieluch 579bc1c2c8 Add more info in route logging 
- Add remote address
 - Add method
 - Add protocol
 - Add response size
 - Use consistent unit for response time (us)
 2015-12-03 09:28:42 +01:00
shoonoise 5cf3425b93 Disable sign out button in case of auth proxy enabled 2015-11-26 17:56:45 +03:00
Mitsuhiro Tanda 2aabb387b1 fix EC2RoleProvider parameter 2015-11-26 16:01:33 +09:00
Mitsuhiro Tanda f972863f49 add credential setting to handleDescribeInstances 2015-11-26 13:21:38 +09:00
utkarshcmu 5559ad1238 Return correct updated+created timestamps to frontend 2015-11-21 05:03:00 -08:00
utkarshcmu 1b7f4f31ca Tired of gofmt 2015-11-20 04:52:50 -08:00
utkarshcmu ca01604b43 Added statements in constructor 2015-11-20 04:37:24 -08:00
utkarshcmu 93f9a0c39c Fixed created & updated columns in dashboard table 2015-11-20 03:10:24 -08:00
Torkel Ödegaard 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
Torkel Ödegaard f0087c93b8 fix(admin settings view): always censor provider_config for system info view, fixes #3268 2015-11-18 15:55:45 +01:00
Torkel Ödegaard 79313aa268 Merge pull request #3253 from mtanda/cloudwatch_ecs 
(cloudwatch) support ECS suggestion
 2015-11-17 14:00:31 +01:00
utkarshcmu f5db9950f8 fixed gofmt tests 2015-11-16 07:28:38 -08:00
utkarshcmu 9485e8cfee /api/admin/users returns user ID 2015-11-16 06:55:02 -08:00
Mitsuhiro Tanda 22b139d9f8 (cloudwatch) support ECS suggestion 2015-11-16 23:21:43 +09:00
Torkel Ödegaard 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
Mitsuhiro Tanda 02a37d670c sort namespaces by alphabetical order 2015-11-11 14:23:43 +09:00
Mitsuhiro Tanda a7deca1df5 sort regions by alphabetical order 2015-11-11 14:23:38 +09:00
Torkel Ödegaard 5d8a51c307 Merge pull request #3129 from utkarshcmu/validity 
Default AWS Region selection from dropdown
 2015-11-09 22:25:30 +01:00
utkarshcmu 6325635fce Corrected the frontend filename 2015-11-09 12:31:35 -08:00
utkarshcmu 7612e47aee Select AWS region from dropdown 2015-11-09 12:08:40 -08:00
Torkel Ödegaard 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
utkarshcmu f55e24cd12 Added missing AWS Regions 2015-11-09 00:28:16 -08:00
Nick Owens 60e797ccc4 pkg/setting: integrate syslog logger settings 2015-11-07 18:35:57 -08:00
Nick Owens 0bff097afb pkg/log: implement syslog logger 2015-11-07 18:34:55 -08:00
Nick Owens b0cb6d6d4c pkg/api/cloudwatch: fix api client construction against aws-sdk-go v0.10.2 2015-11-07 18:17:05 -08:00
Don Thapa b345c7cf46 gofmt happiness 2015-11-07 11:32:06 -06:00
utkarshcmu fe2d8f1ea0 Used dialect for postgres 2015-11-07 05:21:22 -08:00
Don e16bbc660d use [auth.github] -> api_url property; supports git enterprise 2015-11-07 00:06:15 -06:00
utkarshcmu 2676f24e0a Fixed user deletion in Postgres SQL 2015-11-06 20:17:27 -08:00
shoonoise b4a2b96e32 Add options to manage snapshot publishing 2015-10-29 16:40:03 +03:00
Torkel Ödegaard 5d64568f3e refactoring: some minor refactoring and changes to AWS profile PR #3053 2015-10-29 11:44:34 +01:00
Jari Sukanen 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
Torkel Ödegaard 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
Torkel Ödegaard 323e84375b refactoring: minor refactoring and handling of known data source plugins 2015-10-26 16:37:45 +01:00
Torkel Ödegaard da3d5375b8 feat(ldap): refactoring of PR #2928 updated docs 2015-10-26 16:21:03 +01:00
Torkel Ödegaard 38bd0d1aec Merge branch 'ldap-improvements' of https://github.com/abligh/grafana into abligh-ldap-improvements 2015-10-26 15:56:21 +01:00