public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,856 Commits 655 Branches 650 Tags
d95eabfeec00a2386a64db9461e119ff0c8ac4f6
Commit Graph
13856 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Lee 70c42ddcff Merge branch 'sgarg7-master'. Closes #3864 2016-01-27 17:40:51 +01:00
sgarg7 75ab2e026d test(spelling): fix spelling/typo in string 2016-01-27 17:38:02 +01:00
Daniel Lee f43e1ab2ff fix(graph): narrow panels shows right date format on x-axis 
fixes #3852. The function that calculates the date format for
the x-axis on a panel takes the panel width into account and
can be wrong for certain date ranges if the panel is too
narrow. E.g. can show dates in format %m/%d %H:%M when it
should show it as %H:%M
 2016-01-27 17:23:02 +01:00
bergquist 12dfee544f Merge branch 'master' into playlist_tags 2016-01-27 15:22:16 +01:00
Carl Bergquist 0ea651f1df Merge pull request #3856 from Gueust/elasticsearc_fix_error 
Serialize an elasticsearch error previously printed as 'Object'
 2016-01-27 15:08:00 +01:00
Torkel Ödegaard 8ed9e2e5cc Merge pull request #3860 from utkarshcmu/fix-tags 
Fixed broken tags search
 2016-01-26 21:58:20 -05:00
utkarshcmu a352af5b9f Fixed broken tags search 2016-01-26 18:48:13 -08:00
Torkel Ödegaard 51a32a2bfa feat(panels): fixes 2016-01-26 18:08:08 -05:00
Torkel Ödegaard e6013353d2 fix series overrides 2016-01-26 17:54:57 -05:00
Torkel Ödegaard aac190eaa9 feat(panels): graph panel starting to work 2016-01-26 17:50:18 -05:00
Torkel Ödegaard ebba7a0327 feat(graph): updating graph panel to new format progress 2016-01-26 17:28:07 -05:00
bergquist 13d993a836 fix(search): remove old search ctrl 2016-01-26 23:28:06 +01:00
bergquist f384538959 fix(search): fixes broken esc button in search 2016-01-26 23:18:10 +01:00
Gueust 269583a6a1 Serialize an elasticsearch error previously printed as 'Object' 2016-01-26 23:15:54 +01:00
bergquist 0b05d39804 fix(search): fixes missing tags in result 2016-01-26 23:03:03 +01:00
bergquist 2ca7da06a3 Merge branch 'master' into playlist_tags 2016-01-26 22:36:06 +01:00
bergquist 4b59cee17a fix(search): add missing ctrl property in view 2016-01-26 21:12:20 +01:00
Daniel Lee bf817281a5 Merge pull request #3855 from daniellee/docs_singlestat 
Updates documentation for SingleStat thresholds
 2016-01-26 21:07:24 +01:00
Daniel Lee 98982b7a74 docs(singlestat) updates threshold explanation 
The implementation of thresholds changed after fixing #3248. Docs
updated to reflect and explain the change.
 2016-01-26 21:00:13 +01:00
Daniel Lee 2114cbcf0b Merge branch 'circleci_npm' 2016-01-26 20:53:25 +01:00
Daniel Lee 979807feee fix(circleci): deletes node_modules before npm install 2016-01-26 20:52:18 +01:00
bergquist add7078f66 tech(playlist): convert to typescript 2016-01-26 20:37:44 +01:00
Daniel Lee ab4d020212 fix(circleci): updates npm before npm install 
npm for node 4 on circleci is really old. This updates npm and will
hopefully make the build green again.
 2016-01-26 20:33:00 +01:00
Torkel Ödegaard aa251fc9ce feat(panels): upgraded dashlist panel to new format 2016-01-26 12:22:46 -05:00
bergquist c105a07bab Merge branch 'playlist_tags' 2016-01-26 17:56:30 +01:00
bergquist 09de46e5ac tech(search): convert search to typescript 2016-01-26 17:54:19 +01:00
Torkel Ödegaard cc375f48c7 feat(panels): minor fix 2016-01-26 11:34:58 -05:00
utkarshcmu e59b0c0694 Fixed ts file comment 2016-01-25 18:10:48 -08:00
utkarshcmu 07fee0a810 Converted adminStatsCtrl to typescript 2016-01-25 17:49:39 -08:00
Pablo Fischer 29185eeef7 If OpenTSDB is 3rd-party hosted (or by another team) and does not support OPTIONS, send the request as POST (urlencoded) 2016-01-26 00:12:56 +00:00
Torkel Ödegaard 53dc21c69b feat(panels): minor fixes 2016-01-25 17:58:41 -05:00
Torkel Ödegaard b0dd79cbfd feat(panels): MetricsPanelCtrl is starting to work 2016-01-25 17:51:18 -05:00
utkarshcmu 442db7fee1 Changed sql query for grafana_admin_count 2016-01-25 14:30:36 -08:00
Daniel Lee be2e2577b8 fixes #3839 
Uses width set to 800px for invite div instead of position fixed. It
looks the same for desktop and makes the button clickable on smaller
resolutions and mobile. Although it is not really responsive so the
text will be small on mobiles. Better that though than a non-clickable
button.
 2016-01-25 22:59:48 +01:00
Anthony Woods c8c337cead use PBKDF2 to esnure key is 23bytes. 2016-01-26 05:15:29 +08:00
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