Commit Graph

282 Commits

Author SHA1 Message Date
Torkel Ödegaard
7614ddb318 Updated design for snapshot sharing dialog, #1596 2015-03-23 13:58:30 -04:00
Torkel Ödegaard
49a0ea53c7 Merge branch 'develop' of github.com:grafana/grafana into dashboard_snapshot_poc
Conflicts:
	src/app/features/dashboard/partials/shareDashboard.html
2015-03-22 22:04:13 -04:00
Torkel Ödegaard
44bc2b2d56 Updated conf description, metrics interval 2015-03-22 16:30:28 -04:00
Torkel Ödegaard
a26436f59b Server metrics fix 2015-03-22 16:13:16 -04:00
Torkel Ödegaard
1e4c62a70d updated server reporting 2015-03-22 15:45:13 -04:00
Torkel Ödegaard
9c9ebb4987 Updated server stats 2015-03-22 15:24:35 -04:00
Torkel Ödegaard
d987532262 Added server metrics 2015-03-22 15:14:00 -04:00
Torkel Ödegaard
f48f5428e5 Adding snapshot storage and route, #1623 2015-03-21 10:56:26 -04:00
Torkel Ödegaard
964f0861d6 more work on dashboard snapshots 2015-03-21 08:53:16 -04:00
Anthony Woods
7010df0fe8 fixes #1619 Secure PhantomJS Png rendering
removes auth hack to allow phantomjs to query pages as a user
without auth.  Instead we pass phantomjs the session cookie,
which it then includes in the request.
2015-03-21 07:14:13 +08:00
Torkel Ödegaard
94c3a07115 Fixed small issue when using 'Save As', dashboard version was not reset 2015-03-19 10:32:47 -04:00
Torkel Ödegaard
30047e6a9f Updated macaron and ini package 2015-03-19 10:17:16 -04:00
Torkel Ödegaard
eb8b9c4ac3 Increase api_key.key varchar to 255 length 2015-03-18 13:20:15 -04:00
Anthony Woods
fc5839d8f1 gofmt. remove extra whitespace 2015-03-17 23:42:16 +08:00
Anthony Woods
bce62c49d0 fixes #1606 2015-03-17 23:10:49 +08:00
Anthony Woods
6a09a7c398 fixes #1606 emit OrgCreated event when new org created. 2015-03-17 23:09:43 +08:00
Torkel Ödegaard
2fec2c2fa0 Templating: Dashboard will now wait to load until all template variables that have refresh on load set or are initialized via url to be fully loaded and so all variables are in valid state before panels start issuing metric requests. Closes #1255 2015-03-14 15:29:41 -04:00
Torkel Ödegaard
17063df3cc Changed default org name form 'main' to 'Main Org.' 2015-03-12 19:43:52 +01:00
Jason Wilder
d3d896dccd Log more descriptive error when anonymous org is not found
Was logging:

  [middleware.go:78 func·004()] [E] Anonymous access organization error%!(EXTRA <nil>)
2015-03-12 11:49:05 -06:00
Torkel Ödegaard
c1d7bef768 added cert_key and cert_file to defaults.ini 2015-03-11 19:44:31 +01:00
Torkel Ödegaard
477e035f2e Fixed anonymous access mode, Closes #1586 2015-03-11 17:34:11 +01:00
Torkel Ödegaard
f3d4d2782f Simplified single org settings, now auto_assign_org, and auto_assign_org_role, new [users] config section, Closes #1585 2015-03-11 16:19:29 +01:00
Torkel Ödegaard
ebad9cb502 Fixed gofmt formating, updated precommit hook 2015-03-07 16:37:19 +01:00
Torkel Ödegaard
d8005af8ee updated circle with fmt formating test 2015-03-07 16:23:22 +01:00
Torkel Ödegaard
5719e437ef Merge pull request #1556 from jwilder/jw-export
Add dashboards:export CLI command
2015-03-06 07:59:44 +01:00
Torkel Ödegaard
de1e762528 Fixed issue using mysql as session store, Closes #1557 2015-03-04 10:34:26 +01:00
Jason Wilder
433070a135 Add dashboards:export CLI command
Allows exporting all dashboards to a --dir or filtering dashboards
by title.  If no --dir is specified, a single dashboard must be
found and it will be sent to stdout which can be piped to a file.

Fixes #1498
2015-03-03 23:16:14 -07:00
Torkel Ödegaard
c6d4b5cc86 Working on build steps 2015-03-03 17:42:50 +01:00
Torkel Ödegaard
0db55b6194 Work on deb and rpm packages, both seem to work now, #1476 2015-03-03 17:14:58 +01:00
Torkel Ödegaard
7e0f1a57af Progress on deb and rpm packaging, renamed config files, added file logging, #1476 2015-03-03 10:18:37 +01:00
Torkel Ödegaard
04d25dc58a Dashboard: When saving a dashboard and another user has made changes inbetween, the user is promted with a warning if he really wants to overwrite the other's changes, Closes #718 2015-03-02 22:24:01 +01:00
Torkel Ödegaard
ad2065afc7 Began work on deb and rpm packaging, #1476 2015-03-02 15:50:03 +01:00
Torkel Ödegaard
9710771f16 Added basic auth to data source edit/create, add support for basic auth in data source proxy code, Closes #1510 2015-03-02 09:58:35 +01:00
Torkel Ödegaard
d0d995da09 Inital work on SQL metric/annotation data source, #1542 2015-02-28 17:27:30 +01:00
Torkel Ödegaard
04ca85fe89 Moved dashboard theme option from the dashboard to a persisted user setting, #1458 2015-02-28 14:30:08 +01:00
Torkel Ödegaard
ae3b9617b6 Fixed dataproxy test 2015-02-28 12:34:51 +01:00
Torkel Ödegaard
0b1044b46f Fixed plugins go test 2015-02-28 11:38:44 +01:00
Torkel Ödegaard
232f980c72 More work on restoring features after moving to plugin model for datasources, no annotations work again #1276 #1472 2015-02-28 10:52:25 +01:00
Torkel Ödegaard
9e892bddf0 More work on restoring features after moving to plugin model for datasources, #1276 #1472 2015-02-28 09:46:37 +01:00
Torkel Ödegaard
109dd3240a Work on new datasource plugin model, #1276 #1472 2015-02-28 08:25:13 +01:00
Torkel Ödegaard
c198242292 A lot of work on backend plugin model for frontend components, right now for data sources, will enable dropin plugins for data sources and panels, #1472 2015-02-27 22:29:00 +01:00
Torkel Ödegaard
5bd5713a52 Began work on plugin system 2015-02-27 13:45:00 +01:00
Torkel Ödegaard
011fdf7ab6 fixed bug in datasource schema migration 2015-02-26 19:36:11 +01:00
Torkel Ödegaard
c75aa23092 New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440 2015-02-26 17:23:28 +01:00
Torkel Ödegaard
6a2a6afc1d Merge branch 'develop' into apikey_hashed
Conflicts:
	pkg/api/apikey.go
	pkg/services/sqlstore/migrations.go
2015-02-26 15:48:54 +01:00
Torkel Ödegaard
7c241fd617 Added permissions section to admin > edit user view, an admin can now make another user admin, Closes #1517 2015-02-26 15:43:48 +01:00
Torkel Ödegaard
ae7f18f981 Made a copy of influxdb datasource named influxdb_08 so the main influxdb data source can be modified to support InfluxDB 0.9, made some initial experiments to get queries to work, but a lot more work is needed, #1525 2015-02-25 18:43:44 +01:00
Torkel Ödegaard
3f96afba73 Merge branch 'fixDashboardDelete' of https://github.com/raintank/grafana into raintank-fixDashboardDelete
Conflicts:
	pkg/services/sqlstore/dashboard.go
2015-02-25 14:31:44 +01:00
Torkel Ödegaard
9e789e6d82 More work on organization / admin nav, views, #1506 2015-02-25 14:27:34 +01:00
Torkel Ödegaard
563d5e3ad8 All migrations work in sqlite3, mysql and postgres 2015-02-25 07:57:51 +01:00