public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 217d43e512 Update ROADMAP.md 2018-05-07 10:13:39 +02:00
Carl Bergquist 06623506d3 Merge pull request #11805 from simPod/missing-lock 
Add missing items to Gopkg.lock
 2018-05-07 10:08:05 +02:00
Torkel Ödegaard fb7db147ed Merge remote-tracking branch 'origin/11809-permission-dropdown' 2018-05-07 09:49:38 +02:00
Šimon Podlipský 1fbac909cb Remove preceding / from public JS path (#11804) 2018-05-07 08:11:48 +02:00
Ryan McKinley 2ee59ccad8 Add panel scrolling docs (#11826) 2018-05-07 08:03:30 +02:00
Marcus Efraimsson e078e2733f Merge pull request #11803 from svenklemm/whatsnew51-table 
Fix variable interpolation examples in whats new in 5.1 docs
 2018-05-06 08:45:02 +02:00
Sven Klemm 1dd2bce054 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-05 13:33:54 +02:00
Sven Klemm ed4dc241cc escape pipe symbol same way as in templating docs 2018-05-05 10:47:44 +02:00
Marcus Efraimsson 8523b1e410 changelog: add notes about closing #11616 
[skip ci]
 2018-05-04 15:03:30 +02:00
Marcus Efraimsson d0753949bc Merge pull request #11794 from grafana/11616-timepicker-buttons 
fix dark/light theme date selector styling in timepicker control
 2018-05-04 14:55:56 +02:00
Patrick O'Carroll 515eab2405 added left:unset to counter left:0 in recent react-select release 2018-05-04 11:46:17 +02:00
Patrick O'Carroll c897485958 fixed text color in light theme 2018-05-04 10:30:42 +02:00
Marcus Efraimsson 4d2e6b4a34 changelog: add notes about closing #11800 
[skip ci]
 2018-05-03 19:13:57 +02:00
Marcus Efraimsson 6eba9c2438 Merge pull request #11802 from svenklemm/variable-interpolation 
dont shadow format passed in as function parameter in replace function in templatesrv
 2018-05-03 19:09:40 +02:00
Sven Klemm a806f542c6 test if default variable interpolation is effective when no specific 
format is specified
 2018-05-03 18:42:58 +02:00
Marcus Efraimsson 8a9da4ba66 changelog: notes about closing #11690 
[skip ci]
 2018-05-03 18:42:14 +02:00
Marcus Efraimsson da8f6c150b Merge pull request #11751 from mtanda/11690 
fix to match table column name and order
 2018-05-03 18:33:46 +02:00
Daniel Lee d518ed5330 changelog: add notes for ##11754, #11758, #11710 2018-05-03 15:46:21 +02:00
Daniel Lee 2c10f29b0f Merge pull request #11784 from grafana/11754_auth_migration 
increase length of auth_id column in user_auth table
 2018-05-03 15:30:38 +02:00
Daniel Lee 7db9cc3bf0 Merge pull request #11796 from alexanderzobnin/fix-11710 
scroll: fix scrolling on mobile Chrome
 2018-05-03 15:18:29 +02:00
Marcus Efraimsson 99257eb048 Merge branch 'master' of git://github.com/grafana/grafana into WPH95-feature/add_es_alerting 2018-05-03 12:03:04 +02:00
Alexander Zobnin 83d599670d scroll: remove firefox scrollbars 2018-05-03 11:54:02 +03:00
Simon Podlipsky fc0a4b34a1 Add missing items to Gopkg.lock 2018-05-03 01:25:52 +02:00
Sven Klemm f52920aa01 pipe escape try #3 2018-05-03 00:23:35 +02:00
Sven Klemm 7f8dacd087 use ascii code for pipe symbol to not mess up markdown table 2018-05-03 00:19:47 +02:00
Sven Klemm fc7d876158 try to fix table 2018-05-03 00:17:18 +02:00
Sven Klemm 764fa15e24 dont shadow format passed in as function parameter 2018-05-02 23:03:37 +02:00
Torkel Ödegaard c40a50829d fix: removed manully added http server from inject graph as it is now a self registered service 2018-05-02 21:30:15 +02:00
Torkel Ödegaard b5e70d4607 fix: removed unused channel 2018-05-02 19:56:15 +02:00
Torkel Ödegaard e3ea6c683c fix: comment spell fix 2018-05-02 19:56:15 +02:00
Torkel Ödegaard 23655315b8 fix: fixed race condition between http.Server ListenAndServe & Shutdown, now service crash during startup correctly closes http server every time 2018-05-02 19:56:15 +02:00
Torkel Ödegaard d04ad835e2 refactoring: lots of refactoring around server shutdown flows, making sure process is terminated when background service has crashed 2018-05-02 19:56:15 +02:00
Torkel Ödegaard 053c2039bb refactor: provisioning service refactoring 2018-05-02 19:56:15 +02:00
Torkel Ödegaard 14bb7832af Metrics package now follows new service interface & registration (#11787) 
* refactoring: metrics package now follows new service interface & registration

* fix: minor fix, make sure metrics service is imported, by grafana-server
 2018-05-02 19:54:07 +02:00
Marcus Efraimsson 04d071aaa3 Merge pull request #11797 from grafana/revert-11775-unindent 
Revert "Opportunities to unindent code (unindent)"
 2018-05-02 14:19:55 +02:00
Marcus Efraimsson de0d409a23 Revert "Opportunities to unindent code (unindent)" 2018-05-02 14:06:46 +02:00
Alexander Zobnin 64283408ee scroll: fix scrolling on mobile Chrome (#11710) 2018-05-02 12:43:25 +03:00
Marcus Efraimsson 6dcb9e696d changelog: add notes about closing #11625 
[skip ci]
 2018-05-02 11:19:22 +02:00
Marcus Efraimsson f17100e98e Merge pull request #11786 from marefr/11625_save_as 
dashboard: show save as button if user has edit permission

This will show the "Save As..." button in dashboard settings page if the user 
has edit permissions (org role admin/editor or viewers_can_edit enabled) 
and has at least edit permission in any folder.
 2018-05-02 11:15:22 +02:00
Marcus Efraimsson 1f21b3e23b remove jest it.only to not skip important tests 2018-05-02 10:54:00 +02:00
Patrick O'Carroll 3dd073f98d fixed so all buttons are styled not just small ones, fixes #11616 2018-05-02 09:56:53 +02:00
Carl Bergquist 6ed69e3d93 Merge pull request #11775 from knweiss/unindent 
Opportunities to unindent code (unindent)
 2018-05-01 16:03:06 +02:00
Torkel Ödegaard 2b93cbbf04 --amend 2018-05-01 14:18:10 +02:00
Torkel Ödegaard 13e015fe3f fix: improved handling of http server shutdown 2018-05-01 14:14:11 +02:00
Mitsuhiro Tanda 253b2cc081 add test for prometheus table column title 2018-05-01 05:00:56 +09:00
David Kaltschmidt 8a53ec610b Fix url encoding, expand template vars, fix TS hacks 
* moved datasource related functions to panel sub-class
* expand panel template vars for url
* added keybindings for x -> Explore
* url encoding for explore state
 2018-04-30 17:44:30 +02:00
David Kaltschmidt 05b0bfafe4 Explore: Add entry to panel menu to jump to Explore 
* panel container menu gets new Explore entry (between Edit and Share)
* entry only shows if datasource has `supportsExplore` set to true (set
 for Prometheus only for now)
* click on Explore entry changes url to `/explore/state` via location provider
* `state` is a JSON representation of the panel queries
* datasources implement `getExploreState()` how to turn a panel config into explore initial
 state
* Explore can parse the state and initialize its query expressions
* ReactContainer now forwards route parameters as props to component
* `pluginlist` and `singlestat` panel subclasses needed to be adapted because
 `panel_ctrl` now has the location provider as a property already
 2018-04-30 17:44:28 +02:00
Marcus Efraimsson 0fc4da810f changelog: notes about closing #11498 
[skip ci]
 2018-04-30 16:33:27 +02:00
Marcus Efraimsson b0349bc795 Merge pull request #11575 from alexanderzobnin/fix-11498 
Histogram: fix invisible highest value bucket
 2018-04-30 16:32:21 +02:00
Torkel Ödegaard fa7d7ed5df Initial Baby Step to refactoring settings from global vars to instance (#11777) 
* wip: start on refactoring settings

* settings: progress on settings refactor

* refactor: progress on settings refactoring

* fix: fixed failing test

* settings: moved smtp settings from global to instance
 2018-04-30 16:21:04 +02:00