IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,528 Commits 1,123 Branches 715 Tags
ef0b7bda6f556ecc0f9ee5685d75b1cbb5e65c14
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Efraimsson ef0b7bda6f singlestat: render time of last point based on dashboard timezone (#11425) 
* singlestat: render time of last point based on dashboard timezone

* changelog: add note for #10338
 2018-05-08 15:59:29 +02:00
Marcus Efraimsson 219118ef4a Merge pull request #11867 from grafana/11862_migration 
decrease length of auth_id column in user_auth table
 2018-05-08 13:10:22 +02:00
Marcus Efraimsson 3d9ea3f1fa changelog: add notes about closing #11813 
[skip ci]
 2018-05-08 11:36:05 +02:00
Marcus Efraimsson 8ed79d614b decrease length of auth_id column in user_auth table 
certain mysql versions don't support having indices with a greater varchar length
than 190.
 2018-05-08 09:26:28 +02:00
Marcus Efraimsson 23c88a3b3f docs: update installation instructions targeting v5.1.1 stable 2018-05-07 14:57:18 +02:00
Marcus Efraimsson b804f6d999 changelog: 5.1.1 update 
add notes about closing #11743 and add release data for 5.1.1
[skip ci]
 2018-05-07 14:09:04 +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
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
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
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
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
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
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
Marcus Efraimsson 5c57c7cff5 dashboard: show save as button if can edit and has edit permission to folders 2018-04-30 15:38:46 +02:00
Marcus Efraimsson 770acee56a new property for current user indicating if edit permissions in folders 2018-04-30 15:34:31 +02:00
Marcus Efraimsson 3d9b7a5892 increase length of auth_id column in user_auth table 2018-04-30 14:41:52 +02:00
Marcus Efraimsson 4f7791b9fa fix dropdown typeahead issue 
New explore feature overriding css for dropdown typeahead component.
 2018-04-30 11:50:50 +02:00
Marcus Efraimsson 8f29d28572 Merge pull request #11753 from grafana/11743_unit_revert 
revert renaming of unit key ppm
 2018-04-27 14:02:57 +02:00
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