bergquist
1ec97e5199
feat(playlist): shortens urls
2016-01-12 14:36:04 +01:00
bergquist
458d15063d
fix(playlist): remove invalid logging
2016-01-12 14:28:19 +01:00
bergquist
e8786b0747
feat(playlist): renames timespan to interval
2016-01-12 13:56:47 +01:00
bergquist
b79f04493d
style(playlist): abstract DTO creation
2016-01-12 08:36:25 +01:00
bergquist
07fdf6491c
fix(playlist): new url for viewing playlist
2016-01-12 08:17:44 +01:00
bergquist
8a38991270
feat(playlist): changes to relation table
...
Also introduces an abstraction between playlist and dashboard.
This will make it possible to att search, and tag filtering to
playlists without any major refactoring
2016-01-12 08:17:44 +01:00
bergquist
0918063c55
fix(playlist): move dashboard uri cration to Backend
2016-01-08 16:13:49 +01:00
bergquist
22c001c8a6
fix(playlist): implement api according to new standard
2016-01-08 14:21:30 +01:00
utkarshcmu
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08:00
utkarshcmu
d8b90721b3
Able to display login Id of the user in Last Updated By
2015-12-18 03:38:49 -08:00
utkarshcmu
cb5c1bd24d
Removed created_by and fixed gofmt
2015-12-18 02:30:20 -08:00
utkarshcmu
af371249f9
Successfully displayed userdId in UI
2015-12-18 01:52:05 -08:00
utkarshcmu
c433167950
Merged with master, resolved conflicts
2015-12-18 00:23:08 -08:00
utkarshcmu
e0ffcda32e
Added UI , DB settings
2015-12-18 00:20:23 -08:00
Carl Bergquist
25d93d1041
Merge pull request #3066 from mtanda/cloudwatch_annotation
...
(cloudwatch) annotation support
2015-12-15 13:43:02 +01:00
Torkel Ödegaard
5eab5dc47b
feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch
2015-12-15 10:28:52 +01:00
Torkel Ödegaard
2ec5bc77d7
Merge branch 'external-plugins'
2015-12-15 10:10:48 +01:00
Mitsuhiro Tanda
6fa5e681aa
fix EC2RoleProvider parameter
2015-12-15 11:25:20 +09:00
Mitsuhiro Tanda
e631940d9e
pkg/api/cloudwatch: fix api client construction against aws-sdk-go v0.10.2
2015-12-15 11:25:19 +09:00
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
