IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 12:14:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,865 Commits 5,105 Branches 538 Tags 1.9 GiB
c63533f004
Commit Graph

14865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist
38864d74bd
Merge pull request #12180 from grafana/deploy 
Propagate specific git-sha into tarball and docker builds
 2018-06-08 13:02:07 +02:00
bergquist
484d9e3f9d triggers grafana-docker master build 2018-06-08 12:44:01 +02:00
Patrick O'Carroll
77403b0dc1 changed som variables to values so it's the same for dark and light theme, added special styling for login text, link and input (#12196) 2018-06-07 11:03:58 -07: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
Patrick O'Carroll
25f2960717 fixed so panel title doesn't wrap and (#12142) 
dashboard: fix so panel titles doesn't wrap
 2018-06-07 16:20:55 +02:00
Ryan McKinley
1f32871f70 Use Passive eventListener for 'wheel' (#12106) 
* make wheel passive

* remove console
 2018-06-07 03:41:50 -07: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
ryan
09dbb52423 Merge remote-tracking branch 'grafana/master' into focus-panel-search 
* grafana/master:
  nicer collapsed row behaviour (#12186)
  remove DashboardRowCtrl (#12187)
  Annotations support for ifql datasource
  Template variable support for ifql datasource
  Query helpers for IFQL datasource
 2018-06-07 10:31:46 +02:00
David
82ae7c6eee
Merge pull request #12167 from grafana/davkal/ifql-helpers 
Query helpers, Annotations, and Template Variables for IFQL datasource
 2018-06-07 10:24:21 +02:00
Ryan McKinley
17a2ce13f0 nicer collapsed row behaviour (#12186) 
* nicer collapsed row behavior

* don't block events

* use a div to toggle

* use singular name
 2018-06-06 21:58:42 -07:00
Ryan McKinley
415ad8fbf3 remove DashboardRowCtrl (#12187) 2018-06-06 21:57:30 -07:00
ryan
c71608aae8 add panel on enter 2018-06-07 03:08:39 +02:00
ryan
37c45a81a9 autoFocus the search filter 2018-06-07 02:48:54 +02:00
bergquist
f93d83befe adds missing return statement 2018-06-06 22:17:19 +02:00
Sławek Piotrowski
9db964bf35 Fix typo: eleasticsearch -> elasticsearch (#12184) 2018-06-06 13:09:16 -07:00
David Kaltschmidt
cdba2bd184 Annotations support for ifql datasource 2018-06-06 16:11:40 +02:00
Alexander Zobnin
8fd3015e52
dashboard: improve import UX for non-editor users 
validate folderId, import only into available folders
 2018-06-06 15:35:19 +03:00
David Kaltschmidt
2c86484e54 Template variable support for ifql datasource 
* Implements findMetricQuery()
* Macros for template queries: measurements(), tags(), tag_values(),
 field_keys()
* Tests for macro expansion
 2018-06-06 14:11:48 +02:00
Tom Wilkie
c47f40d99c Use cut to trim down the SHA1. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-06-06 12:07:47 +01:00
Alexander Zobnin
9460063ab5
show import menu in sidenav, dashboard search and manage dashboards page 
if user has editor permissions for at least one folder
 2018-06-06 13:55:00 +03:00
David Kaltschmidt
3bd58446d6 Fix metrics panel test by adding config mock 2018-06-06 11:15:24 +02:00
David Kaltschmidt
661503f828 Respect explore settings in config ini 
Previous explore restrictions only took permissions into consideration.

* add `exploreEnabled` to global settings
* only bind `x` if enabled
* only show explore in panel menu if enabled
 2018-06-06 10:50:47 +02:00
David Kaltschmidt
56fc82151b Add .html to webpack.hot resolve extensions 2018-06-06 09:12:06 +02:00
Tom Wilkie
681326140d Version the tarball uploaded to s3 and tell the next step about it. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-06-05 20:02:51 +01:00
Alexander Zobnin
4ff4ac1d5f
dashboard: import into current folder from manage folder page 2018-06-05 20:01:48 +03:00
Alexander Zobnin
393f41cd14
dashboard: add Import button to manage page 2018-06-05 19:37:47 +03:00
Alexander Zobnin
4063ae37a4
dashboard: import to folder 2018-06-05 19:23:09 +03:00
David Kaltschmidt
d7379912c1 Query helpers for IFQL datasource 
* raw CSV preview next to query field (query inspector is not that
 useful here)
* added result table and record counts
 2018-06-05 17:15:35 +02:00
David
45a156577c
Merge pull request #12143 from grafana/davkal/ifql-datasource 
InfluxDB IFQL datasource (beta)
 2018-06-05 14:23:21 +02:00
Leonard Gram
9e7651a1b3
docs: docker secrets available in v5.2.0 2018-06-05 13:54:23 +02:00
David Kaltschmidt
64f5874778 Remove round-robin urls in ifql DS 2018-06-05 13:49:35 +02:00
David Kaltschmidt
1d587450b3 IFQL range variable expansion 2018-06-05 13:42:32 +02:00
Leonard Gram
eb66266629
changelog: release v5.2.0-beta1. 2018-06-05 10:57:18 +02:00
Marcus Efraimsson
cb9fc3f6b4
changelog: add notes about closing #11657 
[skip ci]
 2018-06-05 09:35:24 +02:00
Carl Bergquist
6d27c3d0c5
Merge pull request #12154 from grafana/11657_server_admin 
Always show server admin link in sidenav if grafana admin
 2018-06-05 08:02:05 +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
Dan Cech
9b29a19609
update google auth config docs 2018-06-04 12:32:35 -04: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
Torkel Ödegaard
9e59751c07 fix: fixed problem with expanding access mode help in ds settings 2018-06-04 18:05:16 +02:00
Torkel Ödegaard
ae82112c2e dep: use master branch for plugin model 2018-06-04 17:47:38 +02:00
David
95aef8241c
Merge pull request #12146 from grafana/12144-new-variable-save 
added if to check if new variable has been added
 2018-06-04 17:26:48 +02:00
Patrick O'Carroll
d650dc94c9 fixed so default is all and general only show dashboards 2018-06-04 17:25:20 +02:00
Marcus Efraimsson
09a0a49c52
changelog: add notes about closing #11882 
[skip ci]
 2018-06-04 16:32:42 +02:00
Patrick O'Carroll
937b26f3fd added s to folderId in params 2018-06-04 16:28:24 +02:00
Patrick O'Carroll
89238b4a04 renamed variable in tests 2018-06-04 16:23:36 +02:00
Patrick O'Carroll
b122f53085 added comment, variableChange -> variableValueChange 2018-06-04 16:23:36 +02:00
Patrick O'Carroll
609b0fa498 added a test 2018-06-04 16:23:36 +02:00