IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,394 Commits 1,119 Branches 715 Tags
138c8c348eaf209c59c72d478528006d6082e6d1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Efraimsson 138c8c348e revert renaming of unit key ppm 
#11211 removed the unit key ppm in favor of conppm. A change which is not forward compatible.
This commit revert the unit key back to ppm.
Also adds some better error description if trying to use a unit which don't exists.
Fixes #11743
 2018-04-27 13:41:20 +02:00
Marcus Efraimsson b53a57610b docs: update current version to 5.1 2018-04-26 18:59:45 +02:00
Marcus Efraimsson 6fa7ffc23f docs: update installation instructions targeting v5.1.0 stable 2018-04-26 18:56:44 +02:00
Marcus Efraimsson 914071993d Merge branch 'docs-5.1' 2018-04-26 18:44:51 +02:00
Marcus Efraimsson 28781e7dfd Merge pull request #11736 from grafana/11735_ga 
fix so that google analytics script are cached
 2018-04-26 16:01:08 +02:00
Marcus Efraimsson ddeba41638 fix so that google analytics script are cached 2018-04-26 15:49:22 +02:00
Marcus Efraimsson fff5d7154e Merge pull request #11721 from grafana/11677-missaligned-menu-carot 
fix misalignment of unit and other drop downs in firefox
 2018-04-25 17:24:54 +02:00
Marcus Efraimsson f112e38266 prometheus: convert metric find query tests to jest 2018-04-25 15:37:58 +02:00
Marcus Efraimsson 6687409efb prometheus: fix variable query to fallback correctly to series query 
Using a query of for example up or up{job=job1}
 2018-04-25 15:37:58 +02:00
Marcus Efraimsson 7626775491 Merge pull request #11695 from grafana/11508_variables_preview_values 
allow to show more preview values for variables
 2018-04-24 20:05:47 +02:00
Marcus Efraimsson 1452634a2a mssql: fix value columns conversion to float when using timeseries query 2018-04-24 19:54:08 +02:00
Marcus Efraimsson cf43007531 postgres: fix value columns conversion to float when using timeseries query 2018-04-24 19:53:36 +02:00
Marcus Efraimsson 346577b664 mysql: fix value columns conversion to float when using timeseries query 2018-04-24 19:53:06 +02:00
Marcus Efraimsson 76bd2aea44 sql datasource: extract common logic for converting value column to float 2018-04-24 19:50:14 +02:00
Marcus Efraimsson 7992897418 docs: add known issues section for mssql documentation 
Fixes #11707
 2018-04-24 16:30:24 +02:00
Marcus Efraimsson 85ccefdb84 Merge branch 'master' into docs-5.1 2018-04-24 16:17:15 +02:00
Marcus Efraimsson d36efddcf7 Merge pull request #11699 from grafana/11466-edit-row 
fixed so user who can edit dashboard can edit row
 2018-04-24 14:57:50 +02:00
Marcus Efraimsson d14ac54af6 db: fix failing user auth tests for postgres 2018-04-23 16:02:59 +02:00
Marcus Efraimsson 079346917f use inherited property from api when rendering permissions 2018-04-23 09:23:31 +02:00
Marcus Efraimsson d86ed679b1 return inherited property for permissions 2018-04-23 09:23:14 +02:00
Marcus Efraimsson 9fc59cc212 Merge pull request #11644 from grafana/11392_whats_new_v51 
docs: What's new in v5.1
 2018-04-19 16:37:04 +02:00
Marcus Efraimsson 727a7bf27a docs: what's new improvements 2018-04-19 16:26:42 +02:00
Marcus Efraimsson 886c8b823a docs: what's new improvements 2018-04-19 14:51:33 +02:00
Marcus Efraimsson 540bde269e docs: fix typos 2018-04-19 13:49:40 +02:00
Marcus Efraimsson cc3418f6a3 docs: what's new 
Improved scrolling experience
 2018-04-19 13:44:37 +02:00
Marcus Efraimsson 6737f79331 docs: improve what's new in v5.1 2018-04-19 13:25:16 +02:00
Marcus Efraimsson 250f85b9bd docs: what's new in v5.1 draft 2018-04-19 12:54:10 +02:00
Marcus Efraimsson ba9c3f60c4 Merge branch 'master' into docs-5.1 2018-04-19 10:52:17 +02:00
Marcus Efraimsson e6f38591b5 dev: only build server with bra run 2018-04-19 10:43:31 +02:00
Marcus Efraimsson cec9634f4a fix typo 2018-04-18 14:52:36 +02:00
Marcus Efraimsson 7e8bd8d004 Merge branch 'master' into docs-5.1 2018-04-18 14:39:38 +02:00
Marcus Efraimsson 4ddd15d921 changelog: notes about closing #10427 
[skip ci]
 2018-04-18 14:18:21 +02:00
Marcus Efraimsson fd409f119d Merge pull request #10986 from grafana/10427_addpanel_filter 
add tabs and search filter to new panel control
 2018-04-18 14:13:21 +02:00
Marcus Efraimsson 606257a1da move jest test file to specs 2018-04-18 14:00:15 +02:00
Marcus Efraimsson ce97f89de6 make add panel panel scrollbar adjust when panel/dashboard grid are resized 2018-04-18 13:59:26 +02:00
Marcus Efraimsson 82054e1a3e Merge branch 'master' into 10427_addpanel_filter 2018-04-18 11:36:13 +02:00
Marcus Efraimsson b7b0ca2b90 build: introduce -dev flag optimal for building in development mode 
Fix performance issue with running bra run for go run build.go build
 2018-04-18 11:25:34 +02:00
Marcus Efraimsson d30835f648 docs: update provisioning documentation 
In addition to closing #10883
 2018-04-17 17:22:25 +02:00
Marcus Efraimsson b142d6a037 Merge branch 'master' into docs-5.1 2018-04-17 16:50:26 +02:00
Marcus Efraimsson cfef609c32 changelog: notes about closing #10883 
[skip ci]
 2018-04-17 16:45:44 +02:00
Marcus Efraimsson c120415406 Merge pull request #11398 from bergquist/readonly_dashboards 
improved workflow for provisioned dashboards
 2018-04-17 16:42:08 +02:00
Marcus Efraimsson d7688241c6 Merge branch 'master' into readonly_dashboards 2018-04-17 16:27:51 +02:00
Marcus Efraimsson 2fc1558daf revert changes of add panel button to require save permission 
This resolves an issue where the add panel button was shown on the default home dashboard
 2018-04-17 11:03:46 +02:00
Marcus Efraimsson 8a5cb088d3 Merge branch 'master' into readonly_dashboards 2018-04-17 10:50:04 +02:00
Marcus Efraimsson e21d574814 changelog: fix typo 
[skip ci]
 2018-04-17 10:28:16 +02:00
Marcus Efraimsson a3eff6cf25 changelog: notes about closing #11572 
[skip ci]
 2018-04-17 10:27:12 +02:00
Marcus Efraimsson ffe9b426d4 changelog: notes about closing #10747 
[skip ci]
 2018-04-17 10:00:09 +02:00
Marcus Efraimsson 9733172d3c Merge pull request #11422 from grafana/dashboard-acl-ux2 
improved ux for permission list
 2018-04-17 09:39:39 +02:00
Marcus Efraimsson d9799f7c13 Merge pull request #11572 from grafana/settings-icons-fix 
ux: sizing and positioning of dashboard settings menu icons
 2018-04-17 09:22:16 +02:00
Marcus Efraimsson 92768d5a2b Merge branch 'master' into dashboard-acl-ux2 2018-04-17 09:19:36 +02:00
Marcus Efraimsson a01e6fc9c7 add some more sort order asserts for permissions store tests 2018-04-17 09:19:17 +02:00
Marcus Efraimsson ad22e20ecd docs: update postgres macro functions documentation 
In addition to closing #11578
 2018-04-17 00:06:25 +02:00
Marcus Efraimsson 979f2d79fb Merge branch 'master' into docs-5.1 2018-04-16 23:58:50 +02:00
Marcus Efraimsson 3a5d1f4594 tsdb: update query and annotation editor help texts for postgres 
In addition to closing #11578
 2018-04-16 23:56:14 +02:00
Marcus Efraimsson 69d1330ae9 changelog: notes about closing #11578 
[skip ci]
 2018-04-16 23:46:26 +02:00
Marcus Efraimsson 97e43ddc5a Merge pull request #11592 from svenklemm/postgres-timefilter-macro 
tsdb: improve $__timeFilter macro for postgres
 2018-04-16 23:38:05 +02:00
Marcus Efraimsson 0e0976b0a2 Merge branch 'master' into 10427_addpanel_filter 2018-04-16 23:30:34 +02:00
Marcus Efraimsson 58e6b11809 add some more sort order asserts for permissions store tests 2018-04-16 21:51:53 +02:00
Marcus Efraimsson bc8353ae14 Merge branch 'master' into dashboard-acl-ux2 2018-04-16 21:19:01 +02:00
Marcus Efraimsson e932623cc0 Merge branch 'master' into settings-icons-fix 2018-04-16 17:16:54 +02:00
Marcus Efraimsson 9573bc43ce dashboard: better size and alignment of settings icons 2018-04-16 17:16:35 +02:00
Marcus Efraimsson 90ed046ce3 docs: elasticsearch and influxdb docs for group by time interval option (#11609) 2018-04-16 16:03:50 +02:00
Marcus Efraimsson c9f5568332 Merge branch 'master' into docs-5.1 2018-04-16 14:35:43 +02:00
Marcus Efraimsson 645658d797 changlelog: notes about closing issues/pr's 
#11053, #11252, #10836, #11185, #11168, #11332, #11391, #11073, #9342, #11001, #11183, #11211, #11384, #11095, #10792, #11138, 
#11516
[skip ci]
 2018-04-16 13:08:00 +02:00
Marcus Efraimsson 92ac1fbb5b Merge branch 'master' into docs-5.1 2018-04-16 09:58:46 +02:00
Marcus Efraimsson ff4e38c1d8 provisioned dashboard validation should be made when importing a dashboard 
Had to add the validate before save command before validating provisioned dashboard
so that the import would get a proper dashboard id
 2018-04-13 17:54:41 +02:00
Marcus Efraimsson 79d8937ce5 provisioned dashboard validation should not be made from provisioning service 
Provisioned dashboard validation should not be made when creating/updating a folder or
when provisioning service are trying to provision/create/update dashboard
 2018-04-13 17:45:32 +02:00
Marcus Efraimsson 4f44376564 remove comment/unused variable 2018-04-13 17:11:52 +02:00
Marcus Efraimsson 4a26797cdd Merge branch 'master' into readonly_dashboards 2018-04-13 17:03:00 +02:00
Marcus Efraimsson 48143d6caf Merge branch 'master' into docs-5.1 2018-04-13 16:40:38 +02:00
Marcus Efraimsson 511b34eb5c docs: improves provisoning example for postgres 
[skip ci]
 2018-04-13 16:37:49 +02:00
Marcus Efraimsson 9c492bd774 docs: add mssql provisioning example 2018-04-13 15:53:45 +02:00
Marcus Efraimsson 428d4b0dbf Merge branch 'master' into docs-5.1 2018-04-13 15:44:53 +02:00
Marcus Efraimsson f5363227ff Merge pull request #11423 from bergquist/provisioning_datasources_examples 
docs: adds provisioning examples for all datasources
 2018-04-13 15:36:28 +02:00
Marcus Efraimsson a6a45afc2b Merge branch 'master' into provisioning_datasources_examples 2018-04-13 15:25:28 +02:00
Marcus Efraimsson 14bf067263 docs: improves provisoning example for each datasource 2018-04-13 15:25:13 +02:00
Marcus Efraimsson 060cd6ebef Merge branch 'master' into settings-icons-fix 2018-04-13 14:49:08 +02:00
Marcus Efraimsson f2c5417ee4 Merge branch 'master' into docs-5.1 2018-04-13 11:36:54 +02:00
Marcus Efraimsson aa59843902 docs: update mssql with azure sql database support 2018-04-13 11:36:40 +02:00
Marcus Efraimsson 55d262655a changelog: adds note for #11569 
[skip ci]
 2018-04-13 11:06:57 +02:00
Marcus Efraimsson fa95297e6a docs: update default annotation limit when querying api 
Needed due to closing #11569
 2018-04-13 10:58:29 +02:00
Marcus Efraimsson 80e4a9dc55 Merge branch 'master' into docs-5.1 2018-04-13 10:56:26 +02:00
Marcus Efraimsson 167d5aebe6 Merge pull request #11576 from flopp999/patch-3 
change default annotation limit from 10 to 100 when querying api
 2018-04-13 10:55:01 +02:00
Marcus Efraimsson 224a0eb0d3 Merge branch 'master' into sql-uint64 2018-04-12 19:12:45 +02:00
Marcus Efraimsson a86ee304ff tsdb: remove unnecessary type casts in sql data sources macro engines 2018-04-12 19:08:35 +02:00
Marcus Efraimsson f5586b1270 tsdb: sql data sources should handle time ranges before epoch start correctly 2018-04-12 18:53:12 +02:00
Marcus Efraimsson a3874ce2c7 Merge branch 'master' into sql-uint64 2018-04-12 18:49:27 +02:00
Marcus Efraimsson 1232745e89 docs: fix typo of default port for mssql 
Fixes #11562
 2018-04-11 20:56:16 +02:00
Marcus Efraimsson fe4cfbeb73 Merge branch 'master' into docs-5.1 2018-04-11 20:38:09 +02:00
Marcus Efraimsson cdcaaa5d03 minor scrollbar fixes 
Hide page scrollbar when rendering using phantomjs.
Hide baron scrollbar when rendering using phantomjs.
 2018-04-11 20:12:32 +02:00
Marcus Efraimsson a1b53674a9 dashboard: show baron scrollbar in dashboard panel when mouse is over 
This should make the scrolling user experience much better since it
will highlight and show that content actually can be scrolled when
hovering over a panel.
 2018-04-11 18:12:48 +02:00
Marcus Efraimsson 9549aadd26 fix so that page scrollbars can be scrolled by keyboard on page load 
The page scrollbars are custom, not rendered on the body element and
with css property overflow set for scroll to be enabled.
For being able to scroll the page using the keyboard when a
page loads, some custom code was needed.
This fix should both work when doing a full reload of a url and when
navigating to other pages/dashboards.
For those pages having an input field that are focused on load,
scrolling by keyboard (arrow up/down) will obviously not work.
 2018-04-11 17:49:40 +02:00
Marcus Efraimsson 2956011b60 fix so that dash list panel are rendered correctly 
This resolves issue with dash list panel getting scrollbars
    attached to incorrect elements. Now the panel content are
    rendered correctly and all content are displayed as
    expected.
 2018-04-11 17:44:51 +02:00
Marcus Efraimsson 8c04eb272d panel: add baron scroller to correct element 
This resolves issue with alert list panel getting scrollbars
attached to incorrect element. Now the panel content are
rendered correctly and all content are displayed as
expected.
 2018-04-11 17:41:20 +02:00
Marcus Efraimsson e73479ef33 folders: fix permissions in folder picker component 
Only enable creating new folders from folder picker if user has org roles
admin or editor.
Only render General option in folder picker if user has org roles admin
or editor.
 2018-04-11 00:26:16 +02:00
Marcus Efraimsson b4863002c9 permission: fix user with org viewer save/move permissions 
User with org viewer role should not be able to save/move dashboards
in/to general folder.
 2018-04-11 00:23:50 +02:00
Marcus Efraimsson be4b715aad docker: change mysql container so that it uses utc 2018-04-10 16:59:48 +02:00
Marcus Efraimsson 6cb891dca8 mysql: use a datetime column with microsecond precision in test 2018-04-10 16:37:39 +02:00
Marcus Efraimsson 97f67ddcb8 tsdb: improved floating point support when converting sql time column to epoch (ms) 2018-04-10 16:36:00 +02:00
Marcus Efraimsson 9d84e6f31f mssql: fix precision for time columns in time series query mode 2018-04-10 11:10:56 +02:00