Torkel Ödegaard
0398face05
feat(plugins): dashboard import for data sources is working! #4298
2016-03-12 10:13:49 +01:00
Torkel Ödegaard
3fb0b71822
refactor(): refactoring json usage
2016-03-12 00:13:06 +01:00
Torkel Ödegaard
dfaa6d8eb9
feat(plugins): a lot of work on #4298
2016-03-08 18:17:47 +01:00
bergquist
435d0f22f5
fix(dashlist): better handling of invalid dashboard ids
2016-03-07 11:04:02 +01:00
bergquist
dd7e215e78
feat(dashslist): make sure dashbords exists in recently viewd dashboards
...
closes #4249
2016-03-05 12:27:37 +01:00
utkarshcmu
ac499b3aff
Minor Pre-PR fixes
2016-03-04 01:29:46 -08:00
utkarshcmu
662579e9a9
Added preferences migrations
2016-03-03 02:08:51 -08:00
Torkel Ödegaard
56c080417a
fix(logging): only log to xorm.log when in dev mode, fixes #4182
2016-02-29 13:42:07 +01:00
Torkel Ödegaard
8db7cf49a6
feat(plugins): began refactoring AppSettings -> PluginSettings, and have the plugins list view and plugin edit view be common for all plugins
2016-02-25 14:55:31 +01:00
Torkel Ödegaard
b5dc1727d2
fix(postgres): If password or user is empty use empty quotes for connection string, #3985
2016-02-12 10:10:07 +01:00
Torkel Ödegaard
37c6a1ddf0
feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template
2016-02-10 16:43:35 +01:00
Torkel Ödegaard
fcc960e9a2
Merge pull request #3792 from utkarshcmu/snapshot-view
...
UI Review: Snapshot view
2016-02-05 08:49:23 +01:00
utkarshcmu
338afc80d5
Merge branch 'master' of https://github.com/grafana/grafana into metadata
2016-02-01 10:32:36 -08:00
Torkel Ödegaard
12460af0ec
Merge pull request #3830 from raintank/apiPlugin
...
Add secureJsonData field to appSettings model
2016-01-29 17:17:37 -05:00
Daniel Lee
21632d22ab
Merge pull request #3882 from bergquist/playlist_tags
...
Add support for playlist based on tags
2016-01-29 21:32:58 +01:00
bergquist
d405176367
chore(playlist): remove commented code
2016-01-29 20:33:01 +01:00
bergquist
15087251fb
test(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstore
2016-01-29 20:24:19 +01:00
Anthony Woods
2e9272c778
Merge remote-tracking branch 'upstream/master' into apiPlugin
2016-01-30 01:38:01 +08:00
Anthony Woods
79e7ae4424
fix sql query in GetAdminStats. fixes #3883
2016-01-29 09:38:51 +08:00
bergquist
d27bb4d3fb
style(playlist): move dashboard access to dashboard.go
2016-01-29 01:41:23 +01:00
utkarshcmu
58121d89fc
Updated http_api docs
2016-01-27 22:02:33 -08:00
utkarshcmu
8bd07287f8
Fixed dashboard_tag query
2016-01-27 17:41:23 -08:00
utkarshcmu
753fd164d7
Added createdBy in metadata ui and dashboard table
2016-01-27 17:11:21 -08:00
Carl Bergquist
251bf7a2b4
Merge pull request #3840 from utkarshcmu/stats
...
Grafana stats view as mentioned in #3812
2016-01-27 19:41:10 +01:00
utkarshcmu
442db7fee1
Changed sql query for grafana_admin_count
2016-01-25 14:30:36 -08:00
bergquist
92cba94031
tech(fmt): remove unused code
2016-01-25 22:11:24 +01:00
bergquist
52403ca17e
feat(playlist): add usage statisics
2016-01-25 21:39:45 +01:00
Anthony Woods
05868bc1df
fix typo
2016-01-26 04:24:44 +08:00
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
