public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,590 Commits 655 Branches 650 Tags
d3642a3e91a52df7dd55d1b72ecddfd8ab1ecf53
Commit Graph

20590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 c813a9953a Merge pull request #15786 from grafana/react-select-upgrade 
Updated react select fork to 2.4.1
 2019-03-05 11:44:03 +01:00
Torkel Ödegaard a5455691b3 Hide time info switch when no time options are specified 2019-03-05 11:43:25 +01:00
Torkel Ödegaard 1711622eff Merge pull request #15784 from grafana/15782-error-fix 
In error popup, fixes bug so that string errors are shown again. Fixes #15782
 2019-03-05 10:52:47 +01:00
Hugo Häggmark 48570c6272 Made sure that DataSourceOption displays value and fires onChange/onBlur events (#15757) 
* Fixed #15682 

* fix: Add hideTimeOverride to state since we need to control the Switch

* fix: Back the maxDataPoints change, we need to keep it as a string

Co-authored-by:johannes.schill@polyester.se
 2019-03-05 10:49:45 +01:00
Torkel Ödegaard fde63fc1cf Updated react select fork to 2.4.1 2019-03-05 10:47:52 +01:00
Daniel Lee 8b1e25b50a utils: show string errors. Fixes #15782 2019-03-05 09:32:02 +01:00
Torkel Ödegaard 590450291a Update frontend.md 2019-03-05 09:23:04 +01:00
Torkel Ödegaard 707d0e13bd Update frontend.md 2019-03-05 09:22:26 +01:00
Torkel Ödegaard b787811da8 Merge pull request #15761 from grafana/15708_access 
fix: limit access to org admin and alerting pages
 2019-03-05 09:17:20 +01:00
Torkel Ödegaard 0016ad2cb3 Merge pull request #15774 from ryantxu/set-options 
Rename PanelEditorProps.onChange to onOptionsChange
 2019-03-05 09:11:56 +01:00
Torkel Ödegaard 57810ea5e5 Merge pull request #15775 from ryantxu/rename-interpolate 
use replaceVariables rather than onInterpolate
 2019-03-05 09:10:45 +01:00
Dominik Prokop cee5f030dc Fixed url of back button in datasource edit page, when root_url configured (#15759) 
* Fixed url of back button in datasource edit page, when root_url configured

* Update snapshots

* Use app config directly in ButtonRow instead of passing datasources page URL via prop

* Snapshots update
 2019-03-05 07:35:45 +01:00
Leonard Gram 1e52a1f9a5 Merge pull request #15539 from grafana/repo-recreation-documentation 
docs: howto for recreating our debian repositories.
 2019-03-05 07:18:39 +01:00
Torkel Ödegaard e8d6e4fb48 Merge pull request #15778 from roidelapluie/patch-2 
Add #15752 in CHANGELOG
 2019-03-05 06:05:28 +00:00
Julien Pivotto 8f9246dff0 Add #15752 in CHANGELOG 2019-03-04 23:17:33 +01:00
ryan 3d16528459 use onOptionsChange 2019-03-04 12:35:24 -08:00
ryan 251008f590 use replaceVariables rather than onInterpolate 2019-03-04 11:44:38 -08:00
ryan 77d709d9df use updateOptions rather than onChange 2019-03-04 11:21:05 -08:00
Marcus Efraimsson 989147a1ce changelog: add notes about closing #15650 2019-03-04 17:47:16 +01:00
Marcus Efraimsson 646ca90b10 Merge pull request #15767 from grafana/15650-autofitpanel-kiosktvmode 
No scroll in autofitpanel-mode
 2019-03-04 08:44:28 -08:00
Marcus Efraimsson a6056ba565 changelog: add notes about closing #15765 2019-03-04 17:38:27 +01:00
Marcus Efraimsson 947b38b379 Merge pull request #15766 from grafana/15765-kiosk-mode-url 
fix: Kiosk mode should have &kiosk appended to the url
 2019-03-04 08:36:14 -08:00
Johannes Schill 92ec8757d3 fix: Kiosk mode should have &kiosk appended to the url #15765 2019-03-04 16:33:00 +01:00
Marcus Efraimsson c36047674a changelog: add notes about closing #15077 2019-03-04 16:07:51 +01:00
Marcus Efraimsson 3832eba31f Merge pull request #15077 from activeshadow/aws-rds-max-xids 
Added MaximumUsedTransactionIDs metric to list of AWS RDS metrics.
 2019-03-04 07:05:19 -08:00
Marcus Efraimsson 5638c67be8 org admins should only be able to access org admin pages 2019-03-04 15:51:18 +01:00
Marcus Efraimsson a29b99b96b only editor/admin should have access to alert list/notifications pages 2019-03-04 15:48:07 +01:00
Bryan T. Richardson ae23773db3 Added MaximumUsedTransactionIDs metric to list of AWS RDS metrics. 2019-03-04 07:38:36 -07:00
Johannes Schill cc40a515be fix: When in tv-mode, autofitpanel should not take space from the navbar #15650 2019-03-04 13:46:10 +01:00
Torkel Ödegaard 1312789d1d Merge pull request #15753 from xlson/devenv-influx-fix 
devenv: fixes incorrect influxdb config.
 2019-03-04 11:36:51 +00:00
Torkel Ödegaard 7540527010 Merge pull request #15612 from jsferrei/upstream_stacking_fix 
Toggle stack should trigger a render, not a refresh
 2019-03-04 10:54:36 +00:00
Torkel Ödegaard 28cac0976d Merge pull request #15752 from grafana/hugoh/bug-repeated-row-gauge 
Passing scopedVars down to DataPanel from PanelChrome
 2019-03-04 10:53:07 +00:00
Leonard Gram 818ccb572e devenv: fixes incorrect influxdb config. 
[skip ci]
 2019-03-04 11:23:33 +01:00
Hugo Häggmark 3a65e27e83 Fixes #15739 2019-03-04 10:42:59 +01:00
Torkel Ödegaard b4df0e73cd Merge pull request #15706 from grafana/15656-playlists-with-tags-rebased 
wip: Fix playlists "by tags"
 2019-03-04 09:00:28 +00:00
parry 25b09168eb Don't mutate seriesList parameter in mergeSeriesByTime (#15619) 
* do not mutate seriesList in mergeSeriesByTime

* extendedseriesList -> extendedDatapointsList

* remove toString() from datapoints, since the value can be null
 2019-03-04 09:56:47 +01:00
Marcus Efraimsson 6fd6f893aa new stable docs version 2019-03-04 00:38:19 -08:00
Torkel Ödegaard 328eea3a29 Merge pull request #15713 from grafana/scrollbar-right-side 
Fixed right side scrollbar margin on dashboard page
 2019-03-04 08:13:01 +00:00
Torkel Ödegaard c28fc9f4a7 Merge pull request #15742 from grafana/fix-15664/bits-showing-as-d 
Fixing bits valueFormat
 2019-03-04 08:06:36 +00:00
Peter Holmberg a9ca8e9dec fix 2019-03-02 13:51:55 -08:00
Marcus Efraimsson 0114ffc9ac Merge pull request #15671 from bendrucker/patch-1 
Fix style and grammar in 6.0 announcement
 2019-03-02 13:42:35 -08:00
bergquist 27dc3586b1 changelog: adds note about closing #14239 2019-03-02 21:27:09 +01:00
Marcus Efraimsson d49f0bedd3 fix: prevent datasource json data stored as nil (#15508) 
prevent datasource json data stored as nil

closes #14239
 2019-03-02 21:18:26 +01:00