Commit Graph

2146 Commits

Author SHA1 Message Date
Torkel Ödegaard f0ecbd3878 feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master 2016-02-09 14:20:41 +01:00
Torkel Ödegaard 9dcfe6dc39 feat(apps): more work on app pages and sidemenu subnav 2016-02-09 14:06:23 +01:00
Torkel Ödegaard 18eb9d6076 feat(apps): began work on app pages 2016-02-09 11:17:49 +01:00
Torkel Ödegaard 99a053bbdd feat(): removed unused routes and minor fixes 2016-02-08 16:57:29 +01:00
Torkel Ödegaard 273fbaac68 refactor(): minor changes 2016-02-05 10:37:14 +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
Torkel Ödegaard db27bbb162 Merge pull request #3918 from utkarshcmu/metadata
Added metadata fields under Settings tab
2016-02-05 08:47:57 +01:00
Mitsuhiro Tanda e96d72d669 reuse credentials 2016-02-04 13:16:55 +09:00
Mitsuhiro Tanda 10016d9d38 add CloudWatch DescribeAlarms API support 2016-02-04 13:14:03 +09:00
Mitsuhiro Tanda ccb063df06 (cloudwatch) add test for custom metrics 2016-02-04 13:07:02 +09:00
Mitsuhiro Tanda b90a078be0 (cloudwatch) change implementation to testable 2016-02-04 13:07:02 +09:00
Mitsuhiro Tanda 73ec486434 (cloudwatch) custom metrics support 2016-02-04 13:07:02 +09:00
utkarshcmu 00a6efa15e Excluded total calculations from backend 2016-02-01 23:26:11 -08:00
utkarshcmu 338afc80d5 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-01 10:32:36 -08:00
Torkel Ödegaard 3f945e886b merge sync with master 2016-01-31 19:51:23 +01: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
bergquist 34eb5acee7 feat(dataproxy): remove 'SetCookie' from reponse
set cookie could potentialll leak information about the
datasource if in proxy mode.

closes #3845
2016-01-29 23:17:11 +01:00
Anthony Woods 2e9272c778 Merge remote-tracking branch 'upstream/master' into apiPlugin 2016-01-30 01:38:01 +08:00
bergquist d27bb4d3fb style(playlist): move dashboard access to dashboard.go 2016-01-29 01:41:23 +01:00
bergquist d66932a8a2 chore(playlist): extract playlist start into new file 2016-01-28 23:56:56 +01:00
utkarshcmu 972ac99b7c Added more metadata 2016-01-28 09:53:19 -08:00
utkarshcmu b30dcce4bc Added dtos and UI for more metadata 2016-01-28 00:52:52 -08:00
utkarshcmu 58121d89fc Updated http_api docs 2016-01-27 22:02:33 -08:00
utkarshcmu 6a1192172d Api stores dashboard creator 2016-01-27 21:55:54 -08:00
utkarshcmu 753fd164d7 Added createdBy in metadata ui and dashboard table 2016-01-27 17:11:21 -08:00
Torkel Ödegaard 97ac81aa9c feat(panels): upgradede singlestat panel 2016-01-27 19:07:39 -05:00
Torkel Ödegaard 57d22fb93f Merge remote-tracking branch 'origin/master' into panelbase 2016-01-27 17:33:33 -05: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
Torkel Ödegaard 11e35f7b68 Merge remote-tracking branch 'origin/master' into panelbase 2016-01-25 10:00:25 -05:00
utkarshcmu da67afa51e Fixed api bugs, stats endpoint working 2016-01-24 21:18:17 -08:00
Torkel Ödegaard 4f7fb40d9b feat(panel plugin): improving panel plugin model 2016-01-24 16:39:25 -05: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 f94599cd29 merge apiPlugins with appPlugins 2016-01-22 01:15:04 +08:00
Anthony Woods dcde1422b7 add support for apiPlugin headers.
The header content uses text/Template.  If the apiPlugin is
bundled in an App, then the appSettings.JsonData is passed
to the header template.
2016-01-21 11:41:59 +08:00
Anthony Woods 1bca28ad12 include the jsonData in the AppSettings DTO 2016-01-21 02:23:24 +08:00
utkarshcmu aa1d28835d Fixed angularjs variable names 2016-01-19 23:23:44 -08:00
utkarshcmu 281ec60085 UI and backend working 2016-01-19 22:04:38 -08:00
utkarshcmu 09f5e6f4dc Merge branch 'master' of https://github.com/utkarshcmu/grafana into snapshot-view 2016-01-19 21:05:50 -08:00
Torkel Ödegaard 7a26d309b1 feat(apps): more work on apps and how apps can include panels 2016-01-19 18:18:53 +01: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 3b5a583903 Merge branch 'master' into influxdb-policy-selector 2016-01-18 18:10:01 +01:00
Torkel Ödegaard 6fc972ab1e feat(playlists): merge sync with RP 2016-01-18 16:05:38 +01:00
Torkel Ödegaard 66eebd1ac3 refactor(playlist): refactor of playlist feature, and PR #3776 2016-01-18 16:01:14 +01:00