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
Torkel Ödegaard 267b96cb48 Merge branch 'master' of github.com:grafana/grafana 2018-09-10 09:54:30 +02:00
Torkel Ödegaard 298c088d57 Merge branch 'redux-poc2' 2018-09-10 09:54:14 +02:00
Torkel Ödegaard 5c58a7d7f4 redux: do not use redux logger middleware in production builds 2018-09-10 09:53:52 +02:00
Bob Shannon f257ff0216 Allow oauth email attribute name to be configurable (#13006) 
* Allow oauth email attribute name to be configurable

Signed-off-by: Bob Shannon <bshannon@palantir.com>

* Document e-mail determination steps for generic oauth

* Add reference to email_attribute_name

* Re-add e-mail determination docs to new generic-oauth page

* Inherit default e-mail attribute from defaults.ini
 2018-09-10 09:45:07 +02:00
Sven Klemm 7c78b64a36 Document required order for time series queries (#13204) 2018-09-10 09:33:06 +02:00
Torkel Ödegaard 035b0ab07a Merge branch 'master' into redux-poc2 2018-09-10 09:32:06 +02:00
Torkel Ödegaard 6bdaf57ae7 refactor: changed AlertRuleItem pause action to callback 2018-09-10 09:29:53 +02:00
Sven Klemm 116fb50530 Fix query builder queries for interval start 
This changes the rate and increase queries to not calculate
a value when there is no previous value. This also adds an
order by metric column to prevent inconsistent series ordering
in the legend.
 2018-09-08 08:28:15 +02:00
Peter Holmberg 59b3bfd342 team members, bug in fetching team 2018-09-07 18:01:59 +02:00
Torkel Ödegaard a440d3510a renaming things in admin 2018-09-07 17:55:38 +02:00
Marcus Efraimsson 7a117a6b6c release 5.2.4 2018-09-07 16:57:00 +02:00
Marcus Efraimsson c179926a27 changelog: release 5.2.4 2018-09-07 16:56:31 +02:00
Alexander Zobnin e4a488baf1 graph legend: use refactored version of scrollbar, #13175 2018-09-07 16:12:28 +03:00
Alexander Zobnin 29899003ff Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-09-07 16:07:42 +03:00
Torkel Ödegaard 4391209f7b Merge branch 'master' into redux-poc2 2018-09-07 14:49:05 +02:00
Peter Holmberg 05bfc36516 Teampages page 2018-09-07 14:32:09 +02:00
Torkel Ödegaard 35ef51dca9 refactoring: custom scrollbars PR updated, #13175 2018-09-07 14:24:33 +02:00
Alexander Zobnin 349b2787cb scrollbar: use enzyme for tests instead of react-test-renderer 2018-09-07 14:31:56 +03:00
Torkel Ödegaard 1415bed045 Merge branch 'react-custom-scrollbars-wrapper' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-react-custom-scrollbars-wrapper 2018-09-07 12:50:34 +02:00
Marcus Efraimsson 8f054e7c08 changelog: add notes about closing #13121 
[skip ci]
 2018-09-07 11:30:18 +02:00
Marcus Efraimsson fc597260c0 Merge pull request #13167 from holiiveira/teams-image 
Alert Teams - Adding Action to view the graph by its public URL.
 2018-09-07 11:24:06 +02:00
Marcus Efraimsson a1d1c4fb9a fix code formatting 2018-09-07 11:06:19 +02:00
Sven Klemm 6b863e3b0f Fix quoting to handle non-string values 2018-09-07 10:21:10 +02:00
Alexander Zobnin 8fca79e87e scrollbar refactor: replace HOC by component with children 2018-09-06 22:53:40 +03:00
Alexander Zobnin 729cc94daf graph legend: scroll component refactor 2018-09-06 22:52:56 +03:00
Alexander Zobnin e67b8a3e1a scrollbar refactor: replace HOC by component with children 2018-09-06 22:52:14 +03:00
Carl Bergquist b070784b8a adds usage stats for alert notifiers (#13173) 2018-09-06 21:03:09 +02:00
Marcus Efraimsson 44cd738dd9 changelog: typo 
[skip ci]
 2018-09-06 17:03:43 +02:00
Marcus Efraimsson 479e073451 docs: what's new in v5.3 placeholder 2018-09-06 15:22:03 +02:00
Alexander Zobnin a186bc01e0 tests for withScrollBar() wrapper 2018-09-06 15:37:31 +03:00
Alexander Zobnin 28cc605e32 tests for withScrollBar() wrapper 2018-09-06 15:36:22 +03:00
Marcus Efraimsson bdc3acbd2c changelog: restructure and add 5.3.0-beta1 header 
[skip ci]
 2018-09-06 14:21:36 +02:00
Marcus Efraimsson 3f4099c4a6 changelog: add notes about closing #13157 
[skip ci]
 2018-09-06 14:09:27 +02:00
Alexander Zobnin cf832e7db4 wrapper for react-custom-scrollbars component 2018-09-06 15:09:18 +03:00
Alexander Zobnin 8db2960d0d graph legend: use 'react-custom-scrollbars' for legend scroll 2018-09-06 15:06:54 +03:00
Marcus Efraimsson 26756f86aa Merge pull request #13148 from svenklemm/postgres-min-interval 
Add min time interval support for SQL datasources
 2018-09-06 14:05:39 +02:00
Alexander Zobnin b2ba9c5166 wrapper for react-custom-scrollbars component 2018-09-06 15:03:24 +03:00
Marcus Efraimsson db639684bb docs: sql datasources min time interval 2018-09-06 13:52:16 +02:00
bergquist 4ce41c16fc changelog: note about closing #10424 2018-09-06 13:33:38 +02:00
Carl Bergquist 3c0b1ef581 Merge pull request #13170 from bergquist/alerting_default_setting 
make default values for alerting configurable
 2018-09-06 13:26:42 +02:00
Torkel Ödegaard e364119774 docs: minor fixes 2018-09-06 13:21:11 +02:00
Torkel Ödegaard 320947359c Merge branch '12886-docs-authentication-section' 2018-09-06 13:16:17 +02:00
Torkel Ödegaard d6f9ebab63 docs: Updated auth docs 2018-09-06 13:15:36 +02:00
Torkel Ödegaard a25b594506 docs: updated 2018-09-06 12:13:23 +02:00
bergquist 1e33a3780f spelling errors 2018-09-06 11:51:24 +02:00
bergquist 3ce89cad71 make default values for alerting configurable 2018-09-06 11:26:14 +02:00
Henrique Oliveira e983f8f54b Adding Action to view the graph by its public URL. 2018-09-05 17:35:22 -03:00
Marcus Efraimsson d76dad86c8 changelog: order changes by group (ocd) 
[skip ci]
 2018-09-05 18:49:08 +02:00
Marcus Efraimsson 42d26400b1 changelog: add notes about closing #13030 
[skip ci]
 2018-09-05 18:47:26 +02:00
Marcus Efraimsson 81c5112259 Merge pull request #13165 from grafana/docs-docker-paths 
docs: default paths in the docker container.
 2018-09-05 18:01:01 +02:00