IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 08:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
17,549 Commits 1,121 Branches 715 Tags
0e7b6dcfb454640903c0fc7a79f7c294a3e768d5
Commit Graph
17549 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Marcus Efraimsson 662808f092 Merge pull request #13930 from grafana/enterprise-docs 
docs: restructure and enhancement
 2018-11-08 01:50:35 -08: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
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 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
Torkel Ödegaard 93b4cb562d Fixed issues introduced by changing to PureComponent 2018-11-07 16:03:33 +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
Alexandre de Verteuilandmarefr 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
Marcus Efraimsson f294dbdb86 move enterprise down in menu 2018-11-06 17:39:35 +01:00
Johannes Schill 08251425ca wip: panel-header: Fix shareModal compatibility with react and angular 2018-11-06 16:55:44 +01:00
Johannes Schill 9c28ff8f84 wip: panel-header: Remove custom menu items from panels completely 2018-11-06 16:44:13 +01:00
Johannes Schill dd7437e9e9 wip: panel-header: Reverted a lot of code to pause the "custom menu options" for now 2018-11-06 16:37:51 +01:00
Johannes Schill 49550ccedf wip: panel-header: More merge conflicts during cherry pick 2018-11-06 16:12:04 +01:00
Johannes Schill dbf7f3fb61 wip: panel-header: More merge conflicts during cherry pick 2018-11-06 16:05:34 +01:00
Dan Cechandmarefr 1347ce5f75 Update docs/sources/permissions/datasource_permissions.md 
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
 2018-11-06 15:57:14 +01:00
Dan Cechandmarefr 850c0e7111 Update docs/sources/permissions/datasource_permissions.md 
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
 2018-11-06 15:56:53 +01:00
Dan Cechandmarefr 4ef770fe98 Update docs/sources/permissions/dashboard_folder_permissions.md 
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
 2018-11-06 15:56:32 +01:00
Dan Cechandmarefr 1bc3f0af07 Update docs/sources/http_api/datasource_permissions.md 
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
 2018-11-06 15:56:12 +01:00
Dan Cechandmarefr 8a52cb7714 Update docs/sources/enterprise/index.md 
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
 2018-11-06 15:55:53 +01:00
Dan Cechandmarefr d44b8968d2 Update docs/sources/enterprise/index.md 
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
 2018-11-06 15:55:42 +01:00
Dan Cechandmarefr 803b36a059 Update docs/sources/enterprise/index.md 
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
 2018-11-06 15:55:28 +01:00
Dan Cechandmarefr 5cdd53c5e7 Update docs/sources/enterprise/index.md 
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
 2018-11-06 15:55:05 +01:00
Dan Cechandmarefr 32e001dba4 Update docs/sources/enterprise/index.md 
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
 2018-11-06 15:54:53 +01:00
Dan Cechandmarefr 881c73fb93 Update docs/sources/enterprise/index.md 
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
 2018-11-06 15:54:25 +01:00
Dan Cechandmarefr 044505a213 minor change 
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
 2018-11-06 15:53:49 +01:00
Johannes Schill 6c0c1254fe wip: panel-header: More merge conflicts 2018-11-06 15:44:04 +01:00
David Kaltschmidt dfc0c5052d Fix loglevel tests for Explore loggging 2018-11-06 15:40:29 +01:00