Commit Graph

2146 Commits

Author SHA1 Message Date
Mitsuhiro Tanda 6beb9be42c add CloudWatch Alarm API support 2015-12-15 11:25:15 +09:00
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
Torkel Ödegaard 201f50b121 Merge branch 'master' into external-plugins
Conflicts:
	pkg/api/login.go
	public/app/core/routes/all.js
	public/app/core/table_model.ts
	public/app/panels/table/table_model.ts
	public/app/plugins/panels/table/editor.ts
	public/app/plugins/panels/table/table_model.ts
2015-12-14 17:28:57 +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
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
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
woodsaj 3c13901695 add ui elements for plugins.
This includes support for cusom plugin config directives.
2015-12-04 19:21:33 +08:00
woodsaj c4a0fe0234 add pluginBundle backend api methods and SQL storage 2015-12-03 23:43:55 +08:00
woodsaj bd4cb549d6 add pluginBundle support
A plugnBundle is meta plugin that has a set of dependent plugins
to enable.  This commit includes a plugin.json for a default
"core" bundle that enables all of the shipped panels and datasources.
2015-12-03 15:52:37 +08:00
woodsaj fd392a2422 Merge remote-tracking branch 'upstream/external-plugins' into externalPlugin
Conflicts:
	public/views/index.html
2015-12-03 12:47:58 +08:00
woodsaj 13864853a8 support separate css files for light/dark themes. 2015-12-03 12:29:57 +08:00
Torkel Ödegaard aa766e3e18 Merge branch 'external-plugins' of github.com:grafana/grafana into external-plugins 2015-12-02 18:31:05 +01:00
Torkel Ödegaard ee0e4d2b69 Merge branch 'master' into external-plugins
Conflicts:
	public/app/plugins/panels/table/editor.ts
	public/views/index.html
2015-12-02 18:30:48 +01:00
woodsaj 1b5c40dd1f add role access limitions for menu items.
This allows external-plugin menu items to conditionally
be added to the UI depending on the logged in users
current role.
2015-11-27 16:27:14 +08:00
woodsaj 700b77c450 implement role access checks on external-plugin routes. 2015-11-27 16:26:30 +08: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
Torkel Ödegaard 4a69de1f30 feat(plugins): made panels work as plugins 2015-11-21 13:46:43 +01:00
Torkel Ödegaard df0bc7bbc4 feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185 2015-11-20 09:43:10 +01:00
Torkel Ödegaard 69daede583 feat(external plugins): worked on supporting external plugins better 2015-11-19 18:44:07 +01:00
Torkel Ödegaard f6772bb896 feat(plugins): began work on supporting having plugins outside grafana, for example in grafana data dir, next step is to be able to easily specify what plugins you waant to install 2015-11-19 12:55:13 +01:00
Torkel Ödegaard b21fa2daa0 Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins 2015-11-19 11:05:27 +01: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
woodsaj d503c5d83d refer to plugins are ExternalPlugin instead of thirdParty 2015-11-11 14:30:07 +08: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
utkarshcmu f55e24cd12 Added missing AWS Regions 2015-11-09 00:28:16 -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
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 da7ae2b0ab fix(build/aws): updated aws dependency and fixed minor build issue, fixes #3026 2015-10-26 12:48:30 +01:00
Torkel Ödegaard 6fecb4bf3e fix(http route): fixed dashboard-solo route to not return 404, fixes #2979 2015-10-20 10:02:56 -04:00
Anthony Woods cf89b565a6 initial import of thirdParty route support 2015-10-15 04:14:09 +08:00