Anthony Woods
40d946a6e3
add drop table to ensure existing installs get new schema
2016-01-26 04:18:18 +08:00
utkarshcmu
2190392e05
Added grafana_admins count
2016-01-25 00:39:31 -08:00
utkarshcmu
da67afa51e
Fixed api bugs, stats endpoint working
2016-01-24 21:18:17 -08:00
utkarshcmu
c7fae5386d
Added backend API for stats
2016-01-24 11:01:33 -08:00
Anthony Woods
32f78d465b
add secureJsonData to appSettings model.
...
- adds the new column to the DB table.
- data stored in the DB is encrypted
- update appRouteHeaders templates to use the jsonData and
decrypted secureJsonData
2016-01-23 06:17:22 +08:00
Anthony Woods
423eca6e7d
add support for fetching appSettings by appId
2016-01-21 11:41:02 +08:00
utkarshcmu
ca55d1f315
Minor bug fixes
2016-01-19 05:05:24 -08:00
utkarshcmu
41fd0ed467
Merge branch 'master' of https://github.com/grafana/grafana into snapshot-view
2016-01-19 05:05:03 -08:00
utkarshcmu
bcb44b7b31
UI and backend connectivity implemented
2016-01-19 05:02:22 -08:00
utkarshcmu
1ab1154010
Optimized backend queries
2016-01-19 04:09:57 -08:00
utkarshcmu
8f067a5ed2
Added backend functionality for searching snapshots
2016-01-19 01:37:36 -08:00
utkarshcmu
1952ebf7c4
Fixed failing gofmt tests
2016-01-19 00:33:30 -08:00
utkarshcmu
70481953fd
Snapshot name is saved in DB now
2016-01-19 00:26:20 -08:00
Torkel Ödegaard
66eebd1ac3
refactor(playlist): refactor of playlist feature, and PR #3776
2016-01-18 16:01:14 +01:00
Torkel Ödegaard
e5b3f27a30
Merge branch 'apps'
2016-01-12 15:41:15 +01:00
Carl Bergquist
f7fecdc6de
Merge pull request #3655 from grafana/playlist
...
Persistable playlists
closes #515
closes #1137
2016-01-12 15:20:43 +01:00
bergquist
e8786b0747
feat(playlist): renames timespan to interval
2016-01-12 13:56:47 +01:00
bergquist
98dccb8641
feat(playlist): refactor FE to support playlistitems
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
Torkel Ödegaard
c1e94e61d0
feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings
2016-01-10 21:37:11 +01:00
bergquist
0918063c55
fix(playlist): move dashboard uri cration to Backend
2016-01-08 16:13:49 +01:00
Torkel Ödegaard
69d0e82453
Merge branch 'master' into apps
...
Conflicts:
pkg/services/sqlstore/migrations/migrations.go
2016-01-08 10:20:46 +01:00
bergquist
6c8d084664
Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql
2016-01-07 17:08:31 +01:00
nikita-graf
ee400df930
remove dashboard from playlist when its destroyed
2016-01-05 04:14:39 +03:00
Carl Bergquist
311624beaa
Merge pull request #3598 from eddawley/ISSUE-2818
...
Fixes #2818 . Adds support for mysql backends via unix sockets
2015-12-28 10:33:49 +01:00
utkarshcmu
ca5099f53b
Fixed gofmt tests
2015-12-24 02:25:49 -08:00
utkarshcmu
5877e5e11a
Merged with master, resolved conflicts
2015-12-24 02:24:59 -08:00
Torkel Ödegaard
69eb62c09f
Merge pull request #3597 from eddawley/ISSUE-3461
...
Issue 3461: Session table is now created automatically
2015-12-24 09:59:34 +01:00
Ed Dawley
4da56b65ab
Fixes #2818 . Adds support for mysql backends via unix sockets
2015-12-23 15:06:28 -06:00
Ed Dawley
cd23ab9955
Issue 3461: Session table is now created automatically
2015-12-23 01:33:46 -06:00
Daniel Low
3f9f0679ec
gofmt
2015-12-22 13:10:34 +00:00
Daniel Low
ea566fff24
Add TLS for mysql
...
Use ssl_mode for mysql and add docs
add docs for the new parameters in config
Tolerate ssl_mode without client authentication
Client cert is not necessary for a SSL connection. So we tolerate
failure if client cert is not provided.
Improve error message if missing server_cert_name and mode is not
skip-verify.
2015-12-22 12:42:52 +00:00
Torkel Ödegaard
ad94f99d57
refactor(apps): more WIP work on apps
2015-12-22 11:37:44 +01:00
utkarshcmu
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08:00
Torkel Ödegaard
eacc46da6d
feat(plugins): WIP on new apps concept
2015-12-21 23:09:27 +01:00
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
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
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
utkarshcmu
78fe588330
Removed NewAddColumnMigration via 3473
2015-12-16 02:46:20 -08: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
Torkel Ödegaard
c7e3ed096f
fix(postgres): fixes db migration issue with_credentials column for postgres, fixes #3505
2015-12-14 10:19:53 +01:00
Mitsuhiro Tanda
6edd6c8f03
add with_credentials to datasource model
2015-12-09 14:44:28 +09: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
woodsaj
c4a0fe0234
add pluginBundle backend api methods and SQL storage
2015-12-03 23:43:55 +08:00
