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,824 Commits 1,119 Branches 715 Tags
2288e01752605bbadb7c148714fce1cb714465ab
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Efraimsson 2288e01752 Merge pull request #12169 from alexanderzobnin/feat-10796 
Import dashboard to folder
 2018-06-13 13:10:52 +02:00
Marcus Efraimsson c39979a557 Merge pull request #12255 from dehrax/docs-dev-grafana 
Update "Building from source" docs
 2018-06-13 12:46:45 +02:00
Marcus Efraimsson 3b824a5e00 Merge pull request #12244 from kdombeck/patch-1 
docs: correct provisioning link
 2018-06-13 09:14:32 +02:00
Marcus Efraimsson d8f269954a changelog: add notes about closing #11963 
[skip ci]
 2018-06-12 13:10:48 +02:00
Marcus Efraimsson c0830e9cde mattn/go-sqlite3 v1.6.0 to v1.7.0 2018-06-07 16:53:39 +02:00
Marcus Efraimsson 7d508df1b4 changelog: add notes about closing #11074 
[skip ci]
 2018-06-07 16:24:45 +02:00
Marcus Efraimsson 3fb4eb7322 Merge pull request #12175 from grafana/davkal/12168-fix-explore-setting 
Respect explore settings in config ini
 2018-06-07 12:08:42 +02:00
Marcus Efraimsson cb9fc3f6b4 changelog: add notes about closing #11657 
[skip ci]
 2018-06-05 09:35:24 +02:00
Marcus Efraimsson 962f996799 always show server admin link in sidenav if grafana admin 2018-06-04 19:28:01 +02:00
Marcus Efraimsson d09749eaaa Merge pull request #12153 from grafana/googleOAuthDocs 
update google auth config docs
 2018-06-04 18:50:28 +02:00
Marcus Efraimsson 58406707f9 changelog: add notes about closing #11525 
[skip ci]
 2018-06-04 18:10:28 +02:00
Marcus Efraimsson 38c94bb633 Merge pull request #12117 from grafana/11525-dashlist-folder-picker 
Fix search by folder in dashboard list panel
 2018-06-04 18:08:38 +02:00
Marcus Efraimsson 09a0a49c52 changelog: add notes about closing #11882 
[skip ci]
 2018-06-04 16:32:42 +02:00
Marcus Efraimsson 6281910591 Merge pull request #12037 from grafana/login-change-password 
change admin password after first login
 2018-06-04 16:21:45 +02:00
Marcus Efraimsson 33ee1fba30 Merge pull request #12150 from grafana/12120_whats_new 
Draft: What's new in v5.2
 2018-06-04 15:17:31 +02:00
Marcus Efraimsson 38906acda9 elasticsearch: sort bucket keys to fix issue wth response parser tests 2018-06-04 15:15:47 +02:00
Marcus Efraimsson 0d5579b4c0 docs: what's new in v5.2 2018-06-04 14:31:43 +02:00
Marcus Efraimsson 7453df2662 changelog: add notes about closing #11167 
[skip ci]
 2018-06-04 11:57:13 +02:00
Marcus Efraimsson e258f30704 Merge pull request #12129 from alexanderzobnin/fix-11167 
alert list panel: show alerts for user with viewer role
 2018-06-04 11:54:51 +02:00
Marcus Efraimsson f5cf926364 changelog: add notes about closing #5893 
[skip ci]
 2018-06-01 15:23:26 +02:00
Marcus Efraimsson b6afe5f2e8 Merge pull request #11380 from WPH95/feature/add_es_alerting 
elasticsearch: alerting support
 2018-06-01 15:17:28 +02:00
Marcus Efraimsson b67872bc35 changelog: add notes about closing #11500, #8168, #6541 
[skip ci]
 2018-06-01 14:49:14 +02:00
Marcus Efraimsson ce75afa413 docs: update alerting docs with alerting support for elasticsearch 2018-06-01 12:26:20 +02:00
Marcus Efraimsson b8ff3b1e3f remove dead code 2018-05-31 19:05:32 +02:00
Marcus Efraimsson dcac63936b elasticsearch: minor refactor 
Handle all replacements if interval template variables in the client.
Fix issue with client and different versions.
Adds better tests of the client
 2018-05-31 19:02:20 +02:00
Marcus Efraimsson 28f0acd854 Merge branch 'master' into feature/add_es_alerting 2018-05-31 16:33:07 +02:00
Marcus Efraimsson a2cd05f6db changelog: update 
[skip ci]
 2018-05-31 16:31:53 +02:00
Marcus Efraimsson 67410f7a4d changelog: add notes about closing #10748, #8805 
[skip ci]
 2018-05-31 15:48:19 +02:00
Marcus Efraimsson 938deae4b4 changelog: add notes about closing #11515 
[skip ci]
 2018-05-31 15:24:01 +02:00
Marcus Efraimsson a1b20bf69a Merge pull request #12092 from grafana/11515_import_uid 
Validate uid when importing dashboards
 2018-05-31 15:18:24 +02:00
Marcus Efraimsson 82ba27b5f2 changelog: add notes about closing #11771 
[skip ci]
 2018-05-30 21:31:31 +02:00
Marcus Efraimsson d2296d332e Merge pull request #12107 from grafana/davkal/11771-hide-gridcontrols 
Fix CSS to hide grid controls in fullscreen/low-activity views
 2018-05-30 21:29:24 +02:00
Marcus Efraimsson a4b1dd036d changelog: add notes about closing #11971 
[skip ci]
 2018-05-30 18:11:47 +02:00
Marcus Efraimsson f2942d94a5 changelog: add notes about closing #11645 
[skip ci]
 2018-05-30 09:26:15 +02:00
Marcus Efraimsson 048ac3089b Merge branch 'master' into feature/add_es_alerting 2018-05-29 14:36:52 +02:00
Marcus Efraimsson 79575ea124 changelog: add notes about closing #11494 
[skip ci]
 2018-05-29 14:29:00 +02:00
Marcus Efraimsson 2c8571a686 Merge pull request #12089 from bergquist/graphite_header 
graphite: avoid distributed tracing headers in direct/browser mode
 2018-05-29 14:07:18 +02:00
Marcus Efraimsson e80f54c243 Merge pull request #12094 from grafana/elastic6-docker 
docker: new block for elasticsearch6
 2018-05-29 11:22:42 +02:00
Marcus Efraimsson 2d5ec9b9e4 changelog: add notes about closing #12087 
[skip ci]
 2018-05-29 10:50:13 +02:00
Marcus Efraimsson 1bc94c7d5a Merge pull request #12088 from thurt/12087-better-error-when-smtp-not-configured 
inviting users: show friendlier error message when smtp is not configured
 2018-05-29 10:46:46 +02:00
Marcus Efraimsson 7c3e8afd82 add validation of uid when importing dashboards 2018-05-28 22:34:40 +02:00
Marcus Efraimsson 7548d6f6d1 Show create dashboard link if at least editor in one folder 2018-05-28 20:37:39 +02:00
Marcus Efraimsson 7cb0403faa elasticsearch: handle if alert query contains template variable 
If datasource handles targetContainsTemplate function it can evaluate if a certain
query contains template variables and this is used for show an error message that
template variables not is supported in alert queries.
 2018-05-28 19:45:18 +02:00
Marcus Efraimsson e5e1683840 Merge branch 'master' into feature/add_es_alerting 2018-05-28 18:10:34 +02:00
Marcus Efraimsson 5a96863eed pin versions of xorm to resolve sql tests 
Resolves issue with postgres tests.
Also sets timezone of test instance and database to utc to resolve
mysql tests.
Closes #12065
 2018-05-28 13:07:41 +02:00
Marcus Efraimsson c9e9f25699 use sql builder for the get system stats sql query 2018-05-28 10:37:17 +02:00
Marcus Efraimsson fbc44025dc add usage stats for datasource access mode 2018-05-25 16:06:35 +02:00
Marcus Efraimsson 2ea5b6fe33 add additional usage stats metrics 
nr of folders
nr of folder permissions
nr of dashboard permissions
nr of snapshots
nr of teams
nr of provisioned dashboards
 2018-05-25 14:33:37 +02:00
Marcus Efraimsson a6a12d36d7 add tests for sending usage stats 2018-05-25 13:32:55 +02:00
Marcus Efraimsson 4752d7884a elasticsearch: adds some more/better debug logging to client 2018-05-25 10:31:56 +02:00
Marcus Efraimsson 16c3566a87 elasticsearch: handle NaN values 2018-05-23 22:57:46 +02:00
Marcus Efraimsson 688f5b830c elasticsearch: metric and pipeline agg setting json encoding fix 2018-05-23 22:21:41 +02:00
Marcus Efraimsson 4436b8da12 elasticsearch: query interval override fix 2018-05-23 22:07:52 +02:00
Marcus Efraimsson 8870e3e85b elasticsearch: default interval fix 
5s instead of 15s
 2018-05-23 21:44:09 +02:00
Marcus Efraimsson ed110bc312 Merge pull request #11967 from grafana/migrate-jquery-lodash-extended-to-ts 
chore: migrate files to ts
 2018-05-23 17:58:37 +02:00
Marcus Efraimsson 242689abe2 elasticsearch: pipeline aggregation fix for json encoding 2018-05-23 16:46:26 +02:00
Marcus Efraimsson dce59ccff2 fix: remove deadcode to make gometalinter happy 2018-05-23 15:28:36 +02:00
Marcus Efraimsson 4840adff00 elasticsearch: refactor query handling and use new es simple client 
Removes moment dependency.
Adds response parser tests (based on frontend tests).
Adds time series query tests (based on frontend tests).
Fixes various issues related to response parsing and building search request queries.
Added support for extended stats metrics and geo hash grid aggregations.
 2018-05-23 15:09:58 +02:00
Marcus Efraimsson e171ed8910 elasticsearch: new simple client for communicating with elasticsearch 
Handles minor differences of es 2, 5 and 5.6.
Implements index pattern logic.
Exposes builders for building search requests.
 2018-05-23 14:59:12 +02:00
Marcus Efraimsson 77400cef08 elasticsearch: refactor and cleanup 
Move time series query logic to specific file.
Remove model parser and move to time series query file, adds parser test.
 2018-05-23 14:36:41 +02:00
Marcus Efraimsson 1324a67cbd Merge branch 'master' into WPH95-feature/add_es_alerting 2018-05-23 14:35:45 +02:00
Marcus Efraimsson cebae40468 Merge pull request #11973 from grafana/11953-explore-metricpanel 
explore: fixes #11953
 2018-05-21 11:13:22 +02:00
Marcus Efraimsson b8c4aa3936 Merge pull request #11926 from grafana/davkal/fix-phantomjs-render 
Use babel and hot loader only in yarn start
 2018-05-14 13:47:35 +02:00
Marcus Efraimsson d3f516f1c4 Merge branch 'master' into WPH95-feature/add_es_alerting 2018-05-12 11:33:58 +02:00
Marcus Efraimsson 95285aa09f Merge pull request #11917 from grafana/fix_phantomjs 
resolve phantomjs rendering in production build
 2018-05-11 14:24:52 +02:00
Marcus Efraimsson 8ed856c64f lock caniuse-db version to resolve phantomjs rendering issue 
For some reason a newer version of this sub-dependency makes phantomjs
rendering unable to generate and save a png image, however without
any error message logged
 2018-05-11 14:10:54 +02:00
Marcus Efraimsson 26e1b3a3fa Merge pull request #11914 from b4456609/patch-1 
docs: update dashboard_permissions.md
 2018-05-11 09:21:23 +02:00
Marcus Efraimsson 486aaca109 docs: update installation instructions targeting v5.1.2 stable 2018-05-09 14:03:22 +02:00
Marcus Efraimsson 4dfaab4c5b changelog: add notes about closing #11862, #11656 
[skip ci]
 2018-05-09 10:45:40 +02:00
Marcus Efraimsson cde347bd3d Merge branch 'master' into WPH95-feature/add_es_alerting 2018-05-08 17:13:08 +02:00
Marcus Efraimsson 77421531d0 changelog: add notes about closing #10338 
[skip ci]
 2018-05-08 16:18:54 +02:00
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 99257eb048 Merge branch 'master' of git://github.com/grafana/grafana into WPH95-feature/add_es_alerting 2018-05-03 12:03:04 +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