Mitsuhiro Tanda
3031c2e6fc
fix test
2018-09-13 20:07:43 +09:00
Mitsuhiro Tanda
2926725bab
add annotation option to treat series value as timestamp
2018-09-13 20:05:30 +09:00
David
e4496080ff
Merge pull request #12251 from mtanda/prometheus_use_matchers_for_completion
...
(prometheus) get label name/value from series API
2018-09-13 11:48:13 +02:00
David
a5bcd4b8e4
Adhoc-filtering for prometheus dashboards ( #13212 )
...
* Basic adhoc-filtering support for prometheus
2018-09-12 18:10:57 +02:00
Torkel Ödegaard
c7bb44b34a
fix: url update loop fix ( #13243 )
2018-09-12 13:13:47 +02:00
qhyou11
1786198558
fix theme parameter not working problem while prefer theme set to light ( #13232 )
2018-09-12 06:52:38 +02:00
Torkel Ödegaard
f5ee91f85a
fix: added type export to fix failing test
2018-09-11 19:30:38 +02:00
Torkel Ödegaard
98daceade0
fix: fixed typescript test error
2018-09-11 19:08:32 +02:00
Torkel Ödegaard
dd01abc544
another circleci fix
2018-09-11 18:37:02 +02:00
Torkel Ödegaard
48d1ebacbb
Another circleci fix
2018-09-11 18:32:19 +02:00
Torkel Ödegaard
207ce0cde1
changed gometalinter to use github master
2018-09-11 18:29:50 +02:00
Torkel Ödegaard
888ac27e25
commented out metalinter as gopkg is having issues
2018-09-11 18:24:07 +02:00
David
d8a702cba3
Fix prometheus label filtering for comparison queries ( #13213 )
...
- Now supports click filtering for queries like `metric > 0.1`
2018-09-11 16:57:43 +02:00
Peter Holmberg
0768a078ed
Upgrade react and enzyme ( #13224 )
...
* upgrade to latest react and fixed failing test
* upgrading libs
* grunt exec update due to change filename
* new yarn lock
* updated snaps
2018-09-11 16:31:34 +02:00
Peter Holmberg
9f73f13091
Teams page replace mobx ( #13219 )
...
* creating types, actions, reducer
* load teams and store in redux
* delete team
* set search query action and tests
* Teampages page
* team members, bug in fetching team
* flattened team state, tests for TeamMembers
* test for team member selector
* team settings
* actions for group sync
* tests for team groups
* removed comment
* remove old stores
* fix: formating of datasource.go
* fix: minor changes to imports
* adding debounce and fixing issue in teamlist
* refactoring: moving types to their own files
2018-09-11 14:14:03 +02:00
Torkel Ödegaard
1ce9001141
upgrade of typescript and tslint and jest ( #13223 )
2018-09-11 13:48:13 +02:00
Mitsuhiro Tanda
28250271cc
fix nil pointer dereference ( #13221 )
2018-09-11 12:53:39 +02:00
bergquist
2936e34d75
removes protoc from makefile
2018-09-11 10:53:21 +02:00
Carl Bergquist
2f9675b3f8
Merge pull request #13217 from mike-sol/master
...
Add Centrify documentation for generic_oauth
2018-09-11 09:34:48 +02:00
bergquist
b8a881646a
changelog: note about closing #11681
2018-09-11 09:25:08 +02:00
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
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
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
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
