Carl Bergquist
5069e4eadd
Merge pull request #11681 from Jonnymcc/sort-dashboard-tags
...
Sort results from GetDashboardTags
2018-09-11 09:19:30 +02:00
Mike Sollanych
6b0de126ce
Merge pull request #1 from mike-sol/add-centrify-docs
...
Adding Centrify configuration for Oauth
2018-09-10 13:31:00 -07:00
Mike Sollanych
55e42b5fff
Adding Centrify configuration for Oauth
...
Just some simple directions for configuring Centrify to enable oauth login!
2018-09-10 13:30:29 -07:00
Torkel Ödegaard
679ffbfd83
wip: progress on redux folder store
2018-09-10 21:49:04 +02:00
Torkel Ödegaard
9caa030108
Merge remote-tracking branch 'origin/teams-page-replace-mobx' into folder-to-redux
2018-09-10 21:14:33 +02:00
Torkel Ödegaard
108a20196f
Merge branch 'master' into teams-page-replace-mobx
2018-09-10 19:31:19 +02:00
Peter Holmberg
0cfcf2685e
actions for group sync
2018-09-10 16:58:17 +02:00
Peter Holmberg
b1fe0c4c7e
team settings
2018-09-10 15:53:58 +02:00
Torkel Ödegaard
59b5b146da
wip: began folder to redux migration
2018-09-10 14:30:42 +02:00
Peter Holmberg
841bd5817d
test for team member selector
2018-09-10 14:27:33 +02:00
Peter Holmberg
d494ebc730
flattened team state, tests for TeamMembers
2018-09-10 14:19:27 +02:00
Marcus Efraimsson
35a24032a7
Merge pull request #13208 from grafana/fix-dashboard-permissions
...
fix: Dashboard permissions now shows correctly
2018-09-10 14:00:55 +02:00
Torkel Ödegaard
6c90a53654
refactor: moved stuff into new features dir manage-dashboards
2018-09-10 13:59:31 +02:00
Torkel Ödegaard
e4d9620fc0
move: moved styleguide to admin
2018-09-10 13:38:45 +02:00
Torkel Ödegaard
0f98dcdef0
fix: fixed singlestat test broken due to file move
2018-09-10 13:34:33 +02:00
Torkel Ödegaard
17e99bb38a
Merge branch 'master' of github.com:grafana/grafana
2018-09-10 13:29:57 +02:00
Torkel Ödegaard
34567bc4f1
moved folders from features into the main feature folder they belong to
2018-09-10 13:29:27 +02:00
Carl Bergquist
7e0637aa9d
Merge pull request #12260 from strohi/panelids-for-htmlbookmark
...
added id tag to Panels for html bookmarking on longer Dashboards
2018-09-10 13:01:35 +02:00
Marcus Efraimsson
3fe3f3741f
Merge pull request #13200 from svenklemm/postgres-query-builder-fixes
...
Fix query builder queries for interval start
2018-09-10 13:01:17 +02:00
Marcus Efraimsson
227bf85e5e
Merge pull request #13184 from svenklemm/postgres-interval_ms
...
Fix postgres quoting to handle non-string values
2018-09-10 12:43:10 +02:00
Carl Bergquist
37af10c61f
Merge pull request #13209 from metalmatze/docs-jsonnet
...
Add jsonnet with grafonnet-lib to provisioning docs
2018-09-10 11:59:31 +02:00
Matthias Loibl
d561104b64
Add jsonnet with grafonnet-lib to provisioning docs
2018-09-10 11:45:23 +02:00
Torkel Ödegaard
9cfe2a7f5c
fix: Dashboard permissions now shows correctly, fixes #13201
2018-09-10 11:35:59 +02:00
Torkel Ödegaard
628ef2d9a9
Update CHANGELOG.md
2018-09-10 10:43:00 +02:00
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
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
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
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
Marcus Efraimsson
bdc3acbd2c
changelog: restructure and add 5.3.0-beta1 header
...
[skip ci]
2018-09-06 14:21:36 +02:00
