root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 20 Packages Projects Releases Wiki Activity
2,977 Commits 1,399 Branches 636 Tags 2.5 GiB
Commit Graph

2977 Commits

Author SHA1 Message Date
Torkel Ödegaard f5cd3d853d Small update to confirm dialog 2015-03-03 08:03:21 +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 56c83cefe9 Fixed so that scripted dashboards and json file based dashboards works as in 1.x, Closes #1548 2015-03-02 18:26:43 +01:00
Torkel Ödegaard 6850a4d25d Progress on deb and rpm packaging, init.d script etc, #1476 2015-03-02 17:21:52 +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 ea1164322b Small fixes 2015-03-02 08:33:06 +01:00
Torkel Ödegaard bee501da4a Added different time period override to singlestat panel, added option to hide panel time override info, Closes #171 2015-03-01 12:06:05 +01:00
Torkel Ödegaard 57b5b4c376 Worked on relative time and timeshift overrides for singlestat, still an issue for how to visualize the time override 2015-03-01 11:48:09 +01:00
Torkel Ödegaard 2c3d3d0fe3 Refactoring out common panel metric and query code to a panelHelper service 2015-03-01 11:03:41 +01:00
Torkel Ödegaard d0d995da09 Inital work on SQL metric/annotation data source, #1542 2015-02-28 17:27:30 +01:00
Torkel Ödegaard a3fe1efa2b Merge branch 'css-tweaks' into develop, #1465 2015-02-28 16:41:24 +01:00
Torkel Ödegaard e84d0dd6b3 Light theme tweaks after merge with bulletfactorys light theme fixes 2015-02-28 16:41:02 +01:00
Torkel Ödegaard 0f3bf488f2 Merge branch 'develop' into css-tweaks 2015-02-28 15:48:37 +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 962b316bcf Some clean up and polish of data source edit view 2015-02-28 14:00:04 +01:00
Torkel Ödegaard ae3b9617b6 Fixed dataproxy test 2015-02-28 12:34:51 +01:00
Torkel Ödegaard 3c554953a2 Changed default OpenTSDB downsample aggregator from sum to avg 2015-02-28 12:33:20 +01:00
Torkel Ödegaard 0b1044b46f Fixed plugins go test 2015-02-28 11:38:44 +01:00
Torkel Ödegaard ba56535fa6 Merge branch 'light-theme-tweaks' of github.com:bulletfactory/grafana into css-tweaks 
Conflicts:
	src/css/less/sidemenu.less
 2015-02-28 11:37:38 +01:00
Torkel Ödegaard 2e0e8ba705 Fixed solo panel test 2015-02-28 11:15:21 +01:00
Torkel Ödegaard c283f0996d Fixed solo panel view (used for png rendering) 2015-02-28 11:07:22 +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 4a72c37fc1 Fixes to edit view switching, and to templateValuesSrv 2015-02-28 10:29:17 +01:00
Torkel Ödegaard dcfad7d61b Fixed playlist functionallity, broken after recent changes 2015-02-28 10:04:19 +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
Trent White 5c39a3d004 Reversed button cleanup for light theme 2015-02-26 17:57:32 -05:00
Trent White 4e607876ea further cleanup of styles to make sidebar more readable for light theme. This tweaked link colors, dropdown colors and table tweaks for things like Add API to make them feel a little more organized through shades of gray. 2015-02-26 15:22:15 -05:00
Torkel Ödegaard 011fdf7ab6 fixed bug in datasource schema migration 2015-02-26 19:36:11 +01:00
Trent White 708ddf5387 CSS tweaks to link styles for sidebar, nav bar, search pane. Also the nav bar height seemed off from the sidebar, so made that consistent. Variables were created when colors were hard-coded for both dark and light. This meant that both variables.light.less and variables.dark.less were updated. 2015-02-26 12:37:35 -05: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 c14a90a3d0 A lot of work on new organization selection and sidenav dropdown, #1506 2015-02-26 13:01:34 +01:00
Torkel Ödegaard 528f54153c More work on experimental InfluxDB 0.9 support 2015-02-26 08:55:49 +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 f5f07bd552 Fixed signout links from sidenav 2015-02-25 16:52:57 +01:00
Torkel Ödegaard bbbd3320ef Created seperate admin sidenav #1506 2015-02-25 16:01:37 +01:00
Torkel Ödegaard 32450640e2 Moved clone dashboard above delete in dashboard settings dropdown 2015-02-25 14:32:57 +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 e1d078f2c1 Final frontend changes for account -> org rename 2015-02-25 08:07:52 +01:00
Torkel Ödegaard 563d5e3ad8 All migrations work in sqlite3, mysql and postgres 2015-02-25 07:57:51 +01:00
Torkel Ödegaard 16fd256225 Added missing common.go 2015-02-24 19:10:41 +01:00
Torkel Ödegaard f3f79792ab account -> org table migration is starting to work, need to test mysql and postgres 2015-02-24 18:32:29 +01:00
Torkel Ödegaard ed68a4bb9a More work on SQL migrations 2015-02-24 17:59:21 +01:00
Torkel Ödegaard 02a89c752b Progress on database schema migration for account -> org refactor 2015-02-24 11:46:34 +01:00