public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bergquist 4a8e9cf93f removes more unused code 2018-06-07 07:15:50 +02:00
bergquist 850aa21d45 removes unused code 2018-06-07 07:06:13 +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
Sven Klemm a05d694d31 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-05 23:21:46 +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
bergquist 171a38df99 alerting: fixes broken table rename 2018-06-05 14:29:48 +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
bergquist ab70ead5e4 alerting: renames journal table to alert_notification_journal 2018-06-05 13:10:38 +02:00
bergquist bcbae7aa62 alerting: move queries from evalcontext to notifier base 2018-06-05 12:07:02 +02:00
Carl Bergquist 05245e9b3d Merge pull request #12161 from bergquist/alerting_reminder_invert 
alerting: invert sendOnce to sendReminder
 2018-06-05 11:03:37 +02:00
Leonard Gram eb66266629 changelog: release v5.2.0-beta1. 2018-06-05 10:57:18 +02:00
bergquist 7333d7b8d4 alerting: invert sendOnce to sendReminder 2018-06-05 10:44:17 +02:00
Marcus Efraimsson cb9fc3f6b4 changelog: add notes about closing #11657 
[skip ci]
 2018-06-05 09:35:24 +02:00
bergquist 0c6d8398a1 alerting: remove zero units from duration 2018-06-05 08:42:39 +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
bergquist 93124f38fa alerting: only check frequency when not send once 2018-06-04 22:19:27 +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
bergquist 0e647db485 Merge branch 'master' into alerting_reminder 
* master: (30 commits)
  changelog: add notes about closing #11882
  renamed variable in tests
  added comment, variableChange -> variableValueChange
  added a test
  added if to check if new variable has been added
  Gravatar fallback does not respect 'AppSubUrl'-setting (#12149)
  change admin password after first login
  changelog: adds note about closing #11958
  revert: reverted singlestat panel position change PR #12004
  Revert "provisioning: turn relative symlinked path into absolut paths"
  provisioning: turn relative symlinked path into absolut paths
  changelog: adds note about closing #11670
  elasticsearch: sort bucket keys to fix issue wth response parser tests
  docs: what's new in v5.2
  changelog: add notes about closing #11167
  docs: docker secrets support. (#12141)
  alerting: show alerts for user with Viewer role
  datasource: added option no-direct-access to ds-http-settings diretive, closes #12138
  provisioning: adds fallback if evalsymlink/abs fails
  tests: uses different paths depending on os
  ...
 2018-06-04 17:44:18 +02:00
bergquist 86e65f84f9 alerting: fixes invalid error handling 2018-06-04 17:30:57 +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