IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,994 Commits 5,454 Branches 554 Tags 1.9 GiB
04597b3f54
Commit Graph

2994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anthony Woods
b9b63f695d fixes #1518 fix table name used in dashboard delete. 2015-02-24 08:56:10 +00:00
Torkel Ödegaard
da41d99aa7 Fixed sql integration test 2015-02-23 20:48:43 +01:00
Torkel Ödegaard
26e4809e2e Big Backend Refatoring: Renamed Account -> Org 2015-02-23 20:07:49 +01:00
Torkel Ödegaard
e9e2fa2927 Started Account -> Organization rename 2015-02-23 18:29:01 +01:00
Torkel Ödegaard
5b2715515f Began work on Account -> Organization rethink, #1506 2015-02-23 16:40:04 +01:00
Torkel Ödegaard
a8c90e2365 Small update to commands 2015-02-23 14:20:24 +01:00
Torkel Ödegaard
f66968ae02 Merge remote-tracking branch 'origin/master' into develop 2015-02-23 13:05:46 +01:00
Torkel Ödegaard
a5fd40ed80 OpenTSDB: Fixed issue with auto interval variable going below 1s, Fixes #1325 2015-02-23 13:04:32 +01:00
Torkel Ödegaard
8cc4dae00b Merge remote-tracking branch 'origin/master' into develop 2015-02-23 12:57:12 +01:00
Torkel Ödegaard
2c5f19253c Added margin between opentsdb queries 2015-02-23 12:56:40 +01:00
Torkel Ödegaard
09f2950256 Merge remote-tracking branch 'origin/master' into develop 
Conflicts:
	src/app/features/opentsdb/datasource.js
 2015-02-23 12:50:58 +01:00
Torkel Ödegaard
65307c463a Refactoring opentsdb editor view, merging #1438, made Downsampling enabled by default 2015-02-23 12:48:07 +01:00
Torkel Ödegaard
2ae0ef94de Merge branch 'tsdb_downsample' of https://github.com/frogmaster/grafana into frogmaster-tsdb_downsample 2015-02-23 11:45:30 +01:00
Torkel Ödegaard
138e720695 Increased max user list to 1000 for user admin page, need to paging, but will have to wait a few days 2015-02-23 11:30:58 +01:00
Torkel Ödegaard
12e28c1895 added missing file 2015-02-23 11:24:45 +01:00
Torkel Ödegaard
1a106e5c38 Added change password ability to admin > edit user view, #1446 2015-02-23 11:24:22 +01:00
Torkel Ödegaard
15c52cacfb Import views are now consolidated into one view, and found through one navigation (dashboard search -> Import, Closes #1511 2015-02-23 10:50:50 +01:00
Torkel Ödegaard
4a93d205bb Moved dashboard import and json import to same view, found via dashboard search dropdown, #1511 2015-02-23 10:13:16 +01:00
Torkel Ödegaard
a146a24c06 Fixed small issue in search and showing Home dashboard when filtering by tag 2015-02-23 09:54:26 +01:00
Torkel Ödegaard
6347b9b0d7 Merge remote-tracking branch 'origin/develop' into develop 2015-02-22 08:45:44 +01:00
Torkel Ödegaard
fea6b970e5 Some prep work for using today as relative time, #1186 2015-02-22 08:44:37 +01:00
Torkel Ödegaard
afeaa9fecd Merge pull request #1507 from ryan-williams/typos 
typo fixes, .gitignore tweak
 2015-02-22 08:31:24 +01:00
Torkel Ödegaard
7e82626b17 Fixed bug with custom time range not being initialized correctly, Fixes #1427 2015-02-22 08:25:44 +01:00
Torkel Ödegaard
9b9aab27ca Graphs now update/refresh when you edit annotations, Fixes #1430 2015-02-22 08:09:58 +01:00
Torkel Ödegaard
31e5271921 Fixed number formating issue when InfluxDB return MAX float64, Fixes #1402 2015-02-22 07:44:40 +01:00
Torkel Ödegaard
8c977e37a9 Merge remote-tracking branch 'origin/master' into develop 
Conflicts:
	README.md
 2015-02-21 21:22:09 +01:00
Torkel Ödegaard
9c8134f8bc Dashboard: Fixed memory leak when switching dashboards, Fixes #1497 2015-02-21 21:19:51 +01:00
Ryan Williams
36ec15be8f fix some scripted-dashboard-comment typos 2015-02-20 19:51:23 +00:00
Ryan Williams
c29bf31f2b add intellij files to gitignore 2015-02-20 19:51:21 +00:00
Torkel Ödegaard
5b1727bcba Graph & Singlestat: Support for additional units, Fahrenheit (°F) and Celsius (°C), Humidity (%H), kW, watt-hour (Wh), kilowatt-hour (kWh), velocities (m/s, km/h, mpg, knot), Closes #1366 2015-02-20 14:45:00 +01:00
Torkel Ödegaard
7a14054057 Graph: Shared tooltip improvement, can now support metrics of different resolution/intervals, Closes #978, Fixes #1499 2015-02-20 14:07:24 +01:00
Torkel Ödegaard
481a4b0f1b Small fix to unsavedChangesSrv, did not handle new template variable correctly 2015-02-20 12:25:54 +01:00
Torkel Ödegaard
fe34c8f2e0 Worked on submenu row (templating, annotations), removed templating and annotation feature toggles, the submenu row will be visible as soon as there are any template vars or annotations, #1503 2015-02-20 12:20:10 +01:00