c433167950
Merged with master, resolved conflicts
2015-12-18 00:23:08 -08:00
e0ffcda32e
Added UI , DB settings
2015-12-18 00:20:23 -08:00
3d15ee6d74
allow app menu items to be selectivly pinned to the left nav menu
2015-12-18 15:10:52 +08:00
48cf56b69a
more renaming. also moved apps and datasource menus
2015-12-18 13:46:40 +08:00
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
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
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
78fe588330
Removed NewAddColumnMigration via 3473
2015-12-16 02:46:20 -08:00
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
25d93d1041
Merge pull request #3066 from mtanda/cloudwatch_annotation
...
(cloudwatch) annotation support
2015-12-15 13:43:02 +01:00
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
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
2ec5bc77d7
Merge branch 'external-plugins'
2015-12-15 10:10:48 +01:00
6fa5e681aa
fix EC2RoleProvider parameter
2015-12-15 11:25:20 +09:00
e631940d9e
pkg/api/cloudwatch: fix api client construction against aws-sdk-go v0.10.2
2015-12-15 11:25:19 +09:00
6beb9be42c
add CloudWatch Alarm API support
2015-12-15 11:25:15 +09:00
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
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
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
b63471ebe9
fix(windows): exclude syslog feature from windows builds
2015-12-14 16:16:36 +01:00
c7e3ed096f
fix(postgres): fixes db migration issue with_credentials column for postgres, fixes #3505
2015-12-14 10:19:53 +01:00
4ee9e48e7c
Merge pull request #3405 from piotr1212/master
...
Add more info in route logging
2015-12-11 16:23:59 +01:00
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
225e7a6a32
Merge pull request #3161 from mischief/syslog
...
syslog support closes #3160
2015-12-11 14:03:21 +01:00
c8e894e8f8
sort metrics and dimensions
2015-12-11 17:56:35 +09:00
d9844350fe
update supported metrics and dimensions
2015-12-11 17:42:40 +09:00
2d9d11a89c
reorder supported metrics and dimensions
2015-12-11 17:19:56 +09:00
6edd6c8f03
add with_credentials to datasource model
2015-12-09 14:44:28 +09:00
d7f3869959
gofmt
2015-12-08 14:59:54 +00:00
ed16914715
Add memcache as session provider
2015-12-08 13:35:09 +00:00
79d0f47ee7
Added columns in dashboard_snapshot
2015-12-07 04:24:29 -08:00
42d1205260
Fixed gofmt checks
2015-12-06 23:59:58 -08:00
3d90340446
Added new columns to dashboard table
2015-12-06 23:51:43 -08:00
d1ccf83236
(cloudwatch) use paging
2015-12-06 21:35:20 +09:00
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
3c13901695
add ui elements for plugins.
...
This includes support for cusom plugin config directives.
2015-12-04 19:21:33 +08:00
67dc761344
fix(security): do not print ENV config values when they are passwords, fixes #3337
2015-12-04 10:38:27 +01:00
c4a0fe0234
add pluginBundle backend api methods and SQL storage
2015-12-03 23:43:55 +08:00
207c1a20ee
router logger, log username taken from cookie
2015-12-03 11:05:50 +01:00
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
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
fd392a2422
Merge remote-tracking branch 'upstream/external-plugins' into externalPlugin
...
Conflicts:
public/views/index.html
2015-12-03 12:47:58 +08:00
13864853a8
support separate css files for light/dark themes.
2015-12-03 12:29:57 +08:00
aa766e3e18
Merge branch 'external-plugins' of github.com:grafana/grafana into external-plugins
2015-12-02 18:31:05 +01:00
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
79d29db18b
really fix unit tests.
2015-11-27 17:17:27 +08:00
4f6a52503d
fix plugin unit test
2015-11-27 17:04:43 +08:00
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
700b77c450
implement role access checks on external-plugin routes.
2015-11-27 16:26:30 +08:00
8449017592
Add plugin type field to externalPlugin model
2015-11-27 15:21:57 +08:00
utkarshcmu
woodsaj
Carl Bergquist
Piotr Popieluch
Torkel Ödegaard
Mitsuhiro Tanda
Daniel Low