IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-10 15:45:43 -06:00
Code Issues Packages Projects Releases Wiki Activity
20,751 Commits 5,453 Branches 554 Tags 1.9 GiB
eef94b3f08
Commit Graph

20751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
2039278a93
Merge pull request #15807 from jsferrei/angular-plugin-onquerychange 
Expose onQueryChange to angular plugins
 2019-03-06 09:28:56 +01:00
Torkel Ödegaard
3aad4e212f
Merge pull request #15816 from ryantxu/plugin-page-cleanup 
cleanup plugin versions
 2019-03-06 09:11:57 +01:00
Torkel Ödegaard
5efa737217
Merge pull request #15814 from ryantxu/replace-scoped-vars 
add ScopedVars to props.replaceVariables()
 2019-03-06 09:11:35 +01:00
Torkel Ödegaard
176315cf40 Fixed styling of gicon's in dropdown menus 2019-03-06 09:08:17 +01:00
ryan
909d425008 cleanup plugin versions 2019-03-05 23:40:03 -08:00
ryan
5524dacc9d use explore icon 2019-03-05 23:00:43 -08:00
ryan
3dd7d40718 fix comments 2019-03-05 22:18:42 -08:00
ryan
aa38a9e0b4 typescript functions on replace 2019-03-05 22:14:28 -08:00
ryan
948729e951 remove console.log 2019-03-05 22:00:12 -08:00
ryan
f5aba36814 add ScopedVars to replace function 2019-03-05 21:56:52 -08:00
Dominik Prokop
358f9cbeae Ensure clean master only when publishing package to npm 2019-03-05 21:18:26 +01:00
Dominik Prokop
b816b4e259 Remove log 2019-03-05 21:16:34 +01:00
Dominik Prokop
18999df716 Ensuring master branch when performing release 2019-03-05 21:12:21 +01:00
Marcus Efraimsson
f845a3b841
upgrade xorm packages to latest versions 2019-03-05 21:11:23 +01:00
Jon Ferreira
a3da8dc673 Expose onQueryChange to angular plugins 2019-03-05 15:04:10 -05:00
Daniel Lee
b582611004 docker: update prometheus2 block to version 2.7.2 2019-03-05 20:24:31 +01:00
ryan
94b6fc54ff use replaceVariables 2019-03-05 11:14:22 -08:00
ryan
c9396b2889 Merge remote-tracking branch 'grafana/master' into alpha-text2 
* grafana/master: (57 commits)
  changelog: adds note for #8253
  use default min interval of 1m for sql datasources
  changelog: adds note about closing #15608
  Fixed scrollbar not visible due to content being added a bit after mount, fixes #15711
  Added comment to Docker file
  moving
  style: add gicon-shield to sidemenu class Closes #15591
  remove `UseBool` since we use `AllCols`
  fix: Move chunk splitting from prod to common so we get the same files in dev as prod
  fix: update datasource in componentDidUpdate Closes #15751
  changelog: add notes about closing #15739
  Moved Server Admin and children to separate menu item on Side Menu (#15592)
  update version to 6.1.0-pre
  Viewers with viewers_can_edit should be able to access /explore (#15787)
  Fixed scrolling issue that caused scroll to be locked to the bottom of a long dashboard, fixes #15712
  reordered import
  Wrapperd playlist controls in clickoutsidewrapper
  Turn off verbose output from tar extraction when building docker files, fixes #15528
  Hide time info switch when no time options are specified
  Made sure that DataSourceOption displays value and fires onChange/onBlur events (#15757)
  ...
 2019-03-05 11:02:03 -08:00
Jon Ferreira
46fa09fdad Add a keybinding that toggles all legends in a dashboard 2019-03-05 13:19:40 -05:00
Torkel Ödegaard
5548aa7c05
Merge pull request #15799 from grafana/15614_fix 
use default min interval of 1m for sql datasources
 2019-03-05 18:37:51 +01:00
Marcus Efraimsson
3b9f0e6ef2
fix allow anonymous initial bind for ldap search 2019-03-05 18:03:07 +01:00
Torkel Ödegaard
281d9f6058
Merge pull request #15798 from grafana/fixed-scrollbar-not-visible 
Fixed scrollbar not visible initially (only after manual scroll)
 2019-03-05 17:34:30 +01:00
Daniel Lee
9383b04efd changelog: adds note for #8253 2019-03-05 15:55:10 +01:00
Daniel Lee
fe1c204d4a
Merge pull request #15290 from mtanda/prometheus_label_names_query 
(prometheus) support /api/v1/labels
 2019-03-05 15:45:14 +01:00
Torkel Ödegaard
744bf6a784
Merge pull request #15790 from grafana/reduce-log-output-from-docker-build 
Turn off verbose output from tar extraction when building docker file
 2019-03-05 15:07:15 +01:00
Torkel Ödegaard
6da87a17ef
Merge pull request #15793 from grafana/hugoh/bug-can-not-use-testdatasource-in-v6 
Update datasource in componentDidUpdate so that datasource is correct in state
 2019-03-05 15:06:44 +01:00
Torkel Ödegaard
ef59af5e38
Merge pull request #15795 from grafana/split-chunks-in-dev 
Split javascript to a vendor chunk in dev-mode
 2019-03-05 15:05:03 +01:00
Marcus Efraimsson
df60804937
use default min interval of 1m for sql datasources 2019-03-05 15:03:15 +01:00
Torkel Ödegaard
a57310efa4
Merge pull request #15796 from grafana/move-unitpicker-to-grafana-uo 
Move unitpicker to grafana/ui
 2019-03-05 15:01:17 +01:00
bergquist
d4c718091c changelog: adds note about closing #15608 2019-03-05 14:41:04 +01:00
Carl Bergquist
71bfefa8fb
Merge pull request #15608 from Maddin-619/fix-datasource-update 
Fix Datasource Update to no User/Password
 2019-03-05 14:38:32 +01:00
Torkel Ödegaard
cd78f0bef2 Fixed scrollbar not visible due to content being added a bit after mount, fixes #15711 2019-03-05 14:32:33 +01:00
Torkel Ödegaard
12b6ab2ddd
Merge pull request #15794 from grafana/hugoh/bug-serveradmin-icon-to-dark-in-light-theme 
Add gicon-shield to sidemenu class
 2019-03-05 13:59:22 +01:00
Torkel Ödegaard
a12960e476
Added comment to Docker file 2019-03-05 13:58:43 +01:00
Peter Holmberg
ee4df15526 moving 2019-03-05 13:55:29 +01:00
Hugo Häggmark
062b5f26fe style: add gicon-shield to sidemenu class 
Closes #15591
 2019-03-05 13:46:22 +01:00
bergquist
ae9327ff3a remove UseBool since we use AllCols 2019-03-05 13:41:40 +01:00
Torkel Ödegaard
7f283bdfb9
Merge pull request #15792 from grafana/fix-15712-scroll-issue 
Fixed scrolling issue that caused scroll to be locked to bottom
 2019-03-05 13:32:30 +01:00
Johannes Schill
e3ddfccb61 fix: Move chunk splitting from prod to common so we get the same files in dev as prod 2019-03-05 13:29:54 +01:00
Hugo Häggmark
09b036dc93 fix: update datasource in componentDidUpdate 
Closes #15751
 2019-03-05 13:08:31 +01:00
Marcus Efraimsson
ff7eaced25
changelog: add notes about closing #15739 2019-03-05 13:04:00 +01:00
Hugo Häggmark
d3642a3e91
Moved Server Admin and children to separate menu item on Side Menu (#15592) 
* Moved Server Admin and children to separate menu item on Side Menu

* Removed style guide after PR comments
 2019-03-05 13:02:41 +01:00
Marcus Efraimsson
e3d08e24f3
update version to 6.1.0-pre 2019-03-05 12:58:02 +01:00
Johannes Schill
a81d5486b0 Viewers with viewers_can_edit should be able to access /explore (#15787) 
* fix: Viewers with viewers_can_edit should be able to access /explore #15773

* refactoring initial PR a bit to simplify function and reduce duplication
 2019-03-05 12:41:01 +01:00
Torkel Ödegaard
be8f60b0bf
Merge pull request #15791 from grafana/fix/leave-playlist 
Fix for leaving playlist mode
 2019-03-05 12:38:14 +01:00
Torkel Ödegaard
e6a83bf0e1 Fixed scrolling issue that caused scroll to be locked to the bottom of a long dashboard, fixes #15712 2019-03-05 12:37:19 +01:00
Torkel Ödegaard
a73663de41
Merge pull request #15789 from grafana/hide-time-info 
Hide time info switch when no time options are specified
 2019-03-05 12:15:45 +01:00
Peter Holmberg
a158a19272 reordered import 2019-03-05 12:10:20 +01:00
Peter Holmberg
978cdfba00 Wrapperd playlist controls in clickoutsidewrapper 2019-03-05 12:08:57 +01:00
Torkel Ödegaard
66d9b12981 Turn off verbose output from tar extraction when building docker files, fixes #15528 2019-03-05 12:03:48 +01:00