Commit Graph

17761 Commits

Author SHA1 Message Date
Mario Trangoni
960651e510 scripts/build/release_publisher/publisher_test.go: Fix trivial megacheck warning.
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
scripts/build/release_publisher/publisher_test.go:14:2⚠️ should merge variable declaration with assignment on next line (S1021) (megacheck)
2018-11-09 19:36:14 +01:00
Peter Holmberg
656900516b draw gauge 2018-11-09 16:37:09 +01:00
Torkel Ödegaard
1bad8db94c data source picker demo state 2018-11-09 15:50:09 +01:00
David
0e7b6dcfb4
Merge pull request #14008 from miqh/fix/query-stats-depth
Adjust UI depth of query statistics
2018-11-09 15:06:17 +01:00
David
502b3c390d
Merge pull request #13954 from miqh/fix/apply-function-suggestion
Preserve suffix text when applying function suggestion
2018-11-09 14:56:25 +01:00
Peter Holmberg
9163db02b4 fix in to not render multiple labels 2018-11-09 14:32:14 +01:00
Michael Huynh
5d9faef167
Adjust UI depth of query statistics
A z-index value of less than 1020 is needed because the time selection
dropdown shares the latter value via inheritance. Arbitrarily picked
1015 because it is a notch down.

Related: #14004
2018-11-09 21:09:22 +08:00
Michael Huynh
22b8b04dbe
Preserve suffix text when applying function suggestion
Updates all PromQL function-like suggestions to omit parentheses
when inserted. Such insertions also preserve any suffix text.

Related: #13885
2018-11-09 20:43:20 +08:00
Torkel Ödegaard
a7daf58bb9 wip: progress on edit mode ux with tabs 2018-11-09 13:17:41 +01:00
Peter Holmberg
b536a9f760 can render something 2018-11-08 16:40:53 +01:00
Augustin Husson
2abf8a0e8b don't drop the value when it equals to None 2018-11-08 16:23:40 +01:00
bergquist
16bf269c31 changelog: adds note about closing #13993
[skip ci]
2018-11-08 15:04:16 +01:00
Carl Bergquist
a8b8af9742
Merge pull request #13994 from andreykaipov/feature/more-slack-alerting-options
Adds more options for Slack notifications
2018-11-08 14:59:56 +01:00
Julien Pivotto
62417ca69f Remove Origin and Referer headers while proxying requests
Fix #13949
Fix #13328

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-11-08 14:57:47 +01:00
David
203078280f
Merge pull request #13942 from grafana/davkal/explore-logging-graph
Explore: Logging graph overview and view options
2018-11-08 14:38:29 +01:00
David Kaltschmidt
6b8d7c89ac Refactored log stream merging, added types, tests, comments 2018-11-08 14:24:54 +01:00
Torkel Ödegaard
8a9d721c00 panel-edit-ux-tabs on top alternative 2018-11-08 12:25:22 +01:00
Torkel Ödegaard
964a21b091 Merge branch 'master' into panel-edit-ux 2018-11-08 11:46:04 +01:00
Marcus Efraimsson
662808f092
Merge pull request #13930 from grafana/enterprise-docs
docs: restructure and enhancement
2018-11-08 01:50:35 -08:00
Peter Holmberg
7799ad8108 added loading state 2018-11-08 09:34:14 +01:00
Torkel Ödegaard
7de07eb096
Merge pull request #13992 from grafana/auth_proxy_headers_default
add auth.proxy headers to default.ini
2018-11-08 08:57:33 +01:00
Andrey Kaipov
63fdffe8c0 Fixes #13993 - adds more options for Slack notifications 2018-11-07 22:08:26 -05:00
Marcus Efraimsson
f065af320d
fix switching from es raw document metric breaks query editor 2018-11-08 01:00:20 +01:00
Dan Cech
8a74fe2b76
add auth.proxy headers to sample.ini 2018-11-07 18:21:25 -05:00
Torkel Ödegaard
3b4d8c9b9b
Merge pull request #13984 from grafana/12759-panel-header-standard-menu-only
12759 panel header menu in React (standard options only)
2018-11-07 23:42:42 +01:00
Dan Cech
502290817a
add auth.proxy headers to default.ini 2018-11-07 17:36:44 -05:00
Torkel Ödegaard
29e18fddd0 refactored how testing state was handled, using redux for this felt way to require way to much code 2018-11-07 14:28:44 -08:00
Torkel Ödegaard
8ff6bb07bc Merge branch 'data-source-settings-to-react' of github.com:grafana/grafana into data-source-settings-to-react 2018-11-07 11:51:02 -08:00
Torkel Ödegaard
dcb5015022
Merge pull request #13951 from marefr/11977_6x_terms
Fix terms agg order deprecation warning on es 6+
2018-11-07 20:47:41 +01:00
Torkel Ödegaard
d7655e0b54 fixed issue with reducer sharing url query instance with angular router 2018-11-07 11:44:50 -08:00
Torkel Ödegaard
4e49c453b9
Merge pull request #13990 from grafana/exporter-fix-13891
Exporter bug fix
2018-11-07 20:33:22 +01:00
Torkel Ödegaard
bcd0b2fcf7 Merge branch 'master' into 12759-panel-header-standard-menu-only 2018-11-07 11:22:30 -08:00
Torkel Ödegaard
99610e040f fixed exporter bug missing adding requires for datasources only used via data source variable, fixes #13891 2018-11-07 11:14:39 -08:00
Torkel Ödegaard
0712c52cbc Merge branch 'bergquist-export_dashboard_guidence' 2018-11-07 11:13:22 -08:00
Torkel Ödegaard
c52e91ee6c minor text change in export modal 2018-11-07 10:46:09 -08:00
Torkel Ödegaard
e73e18913c Merge branch 'export_dashboard_guidence' of https://github.com/bergquist/grafana into bergquist-export_dashboard_guidence 2018-11-07 10:34:15 -08:00
Torkel Ödegaard
0353c9ea9f
Merge pull request #13988 from xlson/removes_old_ci
build: removes unused.
2018-11-07 19:32:34 +01:00
Leonard Gram
d88693fd6d build: removes unused. 2018-11-07 17:03:24 +01:00
Peter Holmberg
682697e2cd clear test box if success 2018-11-07 16:14:55 +01:00
Torkel Ödegaard
93b4cb562d Fixed issues introduced by changing to PureComponent 2018-11-07 16:03:33 +01:00
Peter Holmberg
b7d494551c Added testing state in reducer 2018-11-07 15:38:53 +01:00
Torkel Ödegaard
37eb7ca62b further refactoring of #13984 2018-11-07 13:55:02 +01:00
Marcus Efraimsson
d7edc59882
minor fix 2018-11-07 13:52:11 +01:00
Torkel Ödegaard
a24f6998f2 refactorings and some clean-up / removal of things not used 2018-11-07 13:36:35 +01:00
Marcus Efraimsson
454d74a176
Merge pull request #13982 from grafana/adeverteuil-patch-1
Fix typo in docs/sources/reference/scripting.md
2018-11-07 03:49:43 -08:00
Peter Holmberg
e25b2d0ab6 Merge branch 'master' into data-source-settings-to-react 2018-11-07 09:50:17 +01:00
Alexandre de Verteuil
d0794dbce1
Update docs/sources/permissions/dashboard_folder_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-07 09:17:36 +01:00
Alexandre de Verteuil
1d3b8e25ce
Fix typo in docs/sources/reference/scripting.md
Change:
> In the folder grafana install folder under `public/dashboards/` there is a file named `scripted.js`.
…to:
> In the grafana install folder under `public/dashboards/` there is a file named `scripted.js`.
2018-11-06 15:41:37 -05:00
Torkel Ödegaard
7d87f57367 experimental option boxes 2018-11-06 18:55:35 +01:00
Torkel Ödegaard
5975c4a737 ux: changed panel selection ux 2018-11-06 18:34:37 +01:00