woodsaj
0903d5541b
Merge branch 'master' of github.com:grafana/grafana into externalPlugin
...
Conflicts:
pkg/api/api.go
pkg/api/api_plugin.go
pkg/api/datasources.go
pkg/api/frontendsettings.go
pkg/api/index.go
pkg/plugins/models.go
pkg/plugins/plugins.go
2015-12-22 00:23:24 +08:00
Carl Bergquist
fabaf5cc04
Merge pull request #3575 from piotr1212/no_username_in_render_logging
...
Fix empty username in http log for /render calls
2015-12-21 13:31:10 +01:00
Carl Bergquist
af9b864b83
Merge pull request #3446 from utkarshcmu/new-columns
...
Displaying Last UpdatedBy as Metadata
2015-12-20 15:11:20 -05: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
22fd2aed02
Removed columns from snapshot table
2015-12-18 00:30:44 -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
woodsaj
3d15ee6d74
allow app menu items to be selectivly pinned to the left nav menu
2015-12-18 15:10:52 +08:00
woodsaj
48cf56b69a
more renaming. also moved apps and datasource menus
2015-12-18 13:46:40 +08:00
woodsaj
c35b51a268
refactor.
...
Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled.
2015-12-17 23:53:58 +08:00
Carl Bergquist
333f9101a0
Merge pull request #3458 from improbable-io/use-memcache-for-session
...
Add memcache as session provider
2015-12-17 15:56:15 +01:00
Piotr Popieluch
e29e3416db
router logger did not show username in /render calls because cookies are
...
cleared in these call. Not just get username before the call is
executed. see #3405 for more info.
2015-12-17 14:28:11 +01:00
utkarshcmu
78fe588330
Removed NewAddColumnMigration via 3473
2015-12-16 02:46:20 -08:00
carl bergquist
d4e98cd9bc
Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into jmaitrehenry-feature/symlinks
...
Conflicts:
pkg/plugins/plugins.go
closes #2899
closes #2834
2015-12-16 09:21:52 +01: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
f83d5f4280
cleanup(influxdb_08): removed influxdb 0.8 data source as an built in official data source, moved it to an external plugin repo, https://github.com/grafana/datasource-plugin-influxdb-08 , closes #3523
2015-12-15 11:21:00 +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
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
Daniel Low
d7f3869959
gofmt
2015-12-08 14:59:54 +00:00
Daniel Low
ed16914715
Add memcache as session provider
2015-12-08 13:35:09 +00:00
utkarshcmu
79d0f47ee7
Added columns in dashboard_snapshot
2015-12-07 04:24:29 -08:00
utkarshcmu
42d1205260
Fixed gofmt checks
2015-12-06 23:59:58 -08:00
utkarshcmu
3d90340446
Added new columns to dashboard table
2015-12-06 23:51:43 -08:00
Mitsuhiro Tanda
d1ccf83236
(cloudwatch) use paging
2015-12-06 21:35:20 +09:00
woodsaj
0697274695
I add plugin dependency check.
...
This check ensures that all of the plugins required by a bundle
are loaded.
2015-12-05 01:20:42 +08:00
woodsaj
3c13901695
add ui elements for plugins.
...
This includes support for cusom plugin config directives.
2015-12-04 19:21:33 +08: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
woodsaj
c4a0fe0234
add pluginBundle backend api methods and SQL storage
2015-12-03 23:43:55 +08: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
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
