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
5,760 Commits 5,416 Branches 554 Tags
defb15bea1625bb0d2df93a09bce744b5003d747
Commit Graph

5760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bergquist
92cba94031 tech(fmt): remove unused code 2016-01-25 22:11:24 +01:00
Torkel Ödegaard
c30b1b126d feat(panels): minor progress 2016-01-25 15:58:24 -05: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
092bb69c41 instead of padding with 0's, cycle through the secret. 2016-01-26 04:18:44 +08:00
Anthony Woods
40d946a6e3 add drop table to ensure existing installs get new schema 2016-01-26 04:18:18 +08:00
Daniel Lee
5f1fe13530 Merge branch 'jimmyR-master' resolves #3741 2016-01-25 21:16:58 +01:00
jimmyR
d8bb7c3094 resolves #3741 merge conflict 
After a refactoring the sidemenu-canvas css class disappeared so changed the code from #3741 to use the main-view class instead.
 2016-01-25 21:15:54 +01:00
Torkel Ödegaard
9c6698e87b feat(panels): progress on new panel infrastructure, base classes 2016-01-25 15:09:37 -05:00
bergquist
1cac6ecedb tech(docker): update influxdb to use latest 2016-01-25 20:46:15 +01:00
bergquist
40088cd4fe tech(docker): add elastic fig 2016-01-25 20:30:25 +01:00
bergquist
b939a27a8d revert f3bc726001bfbc707597bce5fa169b46e992eb7ao 
This change have caused alot of questions. So we revert
 2016-01-25 18:40:28 +01:00
Torkel Ödegaard
73af4df96d feat(panels): upgraded text panel 2016-01-25 11:41:20 -05:00
Daniel Lee
70cd9265bf Merge pull request #3844 from bergquist/negative_single_stat_panel 
Reduce the amount of thresholds values to two in singlestat panel
 2016-01-25 16:44:37 +01:00
bergquist
cd1b2e2841 feat(singlestat): reduce max thresholds to two. 
closes #3248
 2016-01-25 16:27:58 +01:00
bergquist
b0a24ae4aa tech(singlestat): move singlestat test to plugin 
and change to typescript
 2016-01-25 16:13:45 +01:00
Torkel Ödegaard
11e35f7b68 Merge remote-tracking branch 'origin/master' into panelbase 2016-01-25 10:00:25 -05:00
Torkel Ödegaard
8f4cf6c797 feat(panels): updated text panel to new format 2016-01-25 09:56:17 -05:00
utkarshcmu
2190392e05 Added grafana_admins count 2016-01-25 00:39:31 -08:00
utkarshcmu
a621c0d273 Added docs for stats api 2016-01-25 00:02:05 -08:00
utkarshcmu
4c12703e0c Integrated angularjs with go api 2016-01-24 21:39:30 -08:00
utkarshcmu
da67afa51e Fixed api bugs, stats endpoint working 2016-01-24 21:18:17 -08:00
Torkel Ödegaard
3e14f8a0e5 feat(): panel refactoring 2016-01-24 18:44:21 -05:00
Torkel Ödegaard
a950ff9795 feat(panel): more panel base infrastructure 2016-01-24 17:58:08 -05:00
Torkel Ödegaard
4132cf12e3 feat(panels): more panel refactoring 2016-01-24 17:30:29 -05: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
bergquist
42802ac710 tech(singlestat): convert singlestat panel to typescript 2016-01-24 18:56:10 +01:00
bergquist
a85bda13db tech(docker-dev): update dev docker for graphite 2016-01-24 18:07:42 +01:00
Torkel Ödegaard
ecdc730de7 poc(): new panel system 2016-01-23 15:40:30 -05:00
Torkel Ödegaard
8927042421 more new panel stuff 2016-01-23 01:44:38 +01: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
ab3b586838 add encryption util functions 2016-01-23 03:15:39 +08:00
Torkel Ödegaard
94a7e9b185 poc(panel): experimental panel stuff 2016-01-22 19:59:36 +01:00
Torkel Ödegaard
1a708da155 Merge pull request #3821 from raintank/apiPlugin 
merge apiPlugins with appPlugins
 2016-01-21 19:42:28 +01:00
Anthony Woods
f94599cd29 merge apiPlugins with appPlugins 2016-01-22 01:15:04 +08:00
Torkel Ödegaard
d9d4e6c82f Merge pull request #3819 from bobrik/opentsdb-fill-policy 
Support OpenTSDB 2.2 fill policies, closes #3802
 2016-01-21 17:54:32 +01:00
Torkel Ödegaard
0796b2c0e3 poc(panel as isolated compoennts): experimental panel stuff 2016-01-21 17:46:57 +01:00
Ivan Babrou
bbfdbaf952 Support OpenTSDB 2.2 fill policies, closes #3802 2016-01-21 16:38:46 +00:00
Torkel Ödegaard
7b4fe824ec Merge branch 'master' into panelbase 2016-01-21 15:29:14 +01:00
bergquist
28fabadeae style: remove empty row 2016-01-21 15:13:06 +01:00
Carl Bergquist
37495dd1c6 Merge pull request #3815 from volter/playlist_sort 
Fix dashboard sorting in playlists
 2016-01-21 15:09:33 +01:00
Volker Fröhlich
e5e8e2021f Fix dashboard sorting in playlists 2016-01-21 14:58:15 +01:00
bergquist
dfd4fbc566 feat(hooks): improve symlinks script 2016-01-21 14:39:32 +01:00
bergquist
08f02397b6 fix(fileexport): tslint fix 2016-01-21 14:31:20 +01:00
bergquist
d3f90dcfcc style(fileexport): remove commented code 2016-01-21 14:26:31 +01:00
bergquist
ba65b89bbb feat(csv export): extract csv export into a new file 2016-01-21 14:22:39 +01:00
Torkel Ödegaard
3d353c7d6d fix(mixed datasource): fixed issue with mixed data source in optimized build 2016-01-21 13:14:25 +01:00
Torkel Ödegaard
bc05cc4977 fix(phantomjs): another fix for phantomjs rendering, #3804 2016-01-21 12:57:03 +01:00
Torkel Ödegaard
cbb5811d8b fix(cleanup): removed unused js file 2016-01-21 11:40:04 +01:00