IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-24 23:37:01 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,638 Commits 5,346 Branches 546 Tags 1.8 GiB
5a4e48fa99
Commit Graph

5638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bergquist
52403ca17e feat(playlist): add usage statisics 2016-01-25 21:39:45 +01: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
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
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
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
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
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
Ivan Babrou
bbfdbaf952 Support OpenTSDB 2.2 fill policies, closes #3802 2016-01-21 16:38:46 +00: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
Torkel Ödegaard
6461981aa4 build(): minor change 2016-01-21 11:40:04 +01:00
utkarshcmu
c260c319ee Started Grafana stats poc 2016-01-21 01:48:29 -08:00
Carl Bergquist
d13957cb72 Merge pull request #3803 from xadhoom/table_export_csv 
add export to csv in table panel
 2016-01-21 10:33:18 +01:00
Torkel Ödegaard
4a8f82ca9b fix(image rendering): fixed issue with image rendering, fixes #3804 2016-01-21 10:10:32 +01:00
matteo brancaleoni
cdcc7a7172 add export to csv in table panel 2016-01-21 10:02:23 +01:00
Torkel Ödegaard
f2ce8f266b Merge pull request #3810 from raintank/apiPlugin 
ApiPlugin custom header support
 2016-01-21 08:32:26 +01: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
423eca6e7d add support for fetching appSettings by appId 2016-01-21 11:41:02 +08:00
Anthony Woods
fd52320460 set includedAppId of apiPlugins 2016-01-21 11:39:51 +08:00
Anthony Woods
462608517b set pluginDir of apiPlugin object 2016-01-21 11:38:27 +08:00
Anthony Woods
9586493632 add apiPluginHeader support 2016-01-21 11:37:48 +08:00
Torkel Ödegaard
b150452db3 Merge pull request #3807 from raintank/apiPlugin 
allow saving changes to appModel made by configView directive
 2016-01-20 19:27:57 +01:00
Anthony Woods
1bca28ad12 include the jsonData in the AppSettings DTO 2016-01-21 02:23:24 +08:00
Anthony Woods
9e121ef0c8 add save button to config page 
configView directives can update the appModel object.  We need
a save button to persist the updates.
 2016-01-21 02:21:30 +08:00
Torkel Ödegaard
5f5fcc0e04 fix(submenu): added ngInject comment to dashboard submenu 2016-01-20 11:57:56 +01:00
Torkel Ödegaard
1979143e7c fix(export): fix export dashboard to json, been broken in master for 2-3 weeks 2016-01-20 11:20:33 +01:00
Torkel Ödegaard
32ffedccda Merge pull request #3798 from mtanda/prometheus_doc_metrics 
(prometheus) add explanation about incompatibility of metric find query
 2016-01-20 10:43:37 +01:00
Torkel Ödegaard
4f7f03a28c fix(playlist): fix for memory leak when running playlist for a long period, fixes #3794 2016-01-20 10:39:58 +01:00
Mitsuhiro Tanda
d0074b25db (prometheus) add explanation about incompatibility of metric find query 2016-01-20 18:30:17 +09:00
Torkel Ödegaard
fb82425d3e Merge pull request #3797 from utkarshcmu/playlist-unused 
Removed unused component from playlist code
 2016-01-20 08:59:03 +01:00