Commit Graph

16339 Commits

Author SHA1 Message Date
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
Torkel Ödegaard
f360b6186b wip: first couple of things starting to work 2018-09-13 10:52:29 +02:00
Torkel Ödegaard
8096cd8f33 fix: added reducer test 2018-09-13 07:30:27 +02:00
David
a5bcd4b8e4 Adhoc-filtering for prometheus dashboards (#13212)
* Basic adhoc-filtering support for prometheus
2018-09-12 18:10:57 +02:00
Marcus Efraimsson
c56ca57df5
docs: include active directory ldap example and restructure 2018-09-12 17:54:47 +02:00
Dan Doyle
f0e905f3c9 First pass at a text based template var, getting feedback from devs 2018-09-12 13:17:15 +00:00
Torkel Ödegaard
c7bb44b34a
fix: url update loop fix (#13243) 2018-09-12 13:13:47 +02:00
Torkel Ödegaard
a317158b72 wip: working on reducer test 2018-09-12 12:18:24 +02:00
Torkel Ödegaard
78d36f784f fix: gofmt issues 2018-09-12 09:55:22 +02:00
Torkel Ödegaard
0705bf570d fix: added loading nav states 2018-09-12 09:47:23 +02:00
bergquist
835a75335c Merge branch 'master' into 9587_annotation_tags_wih_temp_var
* master:
  fix theme parameter not working problem while prefer theme set to light (#13232)
  fix: added type export to fix failing test
  fix: fixed typescript test error
  another circleci fix
  Another circleci fix
  changed gometalinter to use github master
  commented out metalinter as gopkg is having issues
  Fix prometheus label filtering for comparison queries (#13213)
  Upgrade react and enzyme (#13224)
  Teams page replace mobx (#13219)
  upgrade of typescript and tslint and jest (#13223)
  fix nil pointer dereference (#13221)
2018-09-12 09:23:54 +02:00
Torkel Ödegaard
a83beac565 redux: moved folders to it's own features folder 2018-09-12 09:15:18 +02:00
Torkel Ödegaard
7c27a87dcb Merge branch 'master' into folder-to-redux 2018-09-12 08:28:37 +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
ec41d76080 mobx -> redux: major progress on folder migration 2018-09-11 19:00:37 +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
Torkel Ödegaard
19cbff658b wip: folder settings page to redux progress 2018-09-11 17:36:23 +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
bergquist
1638c6bea1 enable partial tag matches for annotations 2018-09-11 15:50:04 +02:00
Torkel Ödegaard
89ea47e7fb Merge branch 'master' into folder-to-redux 2018-09-11 15:07:03 +02:00
bergquist
19c7dd9834 support template variables with multiple values 2018-09-11 14:25:25 +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
bergquist
6ba5550f5f renames jest files to match new convention 2018-09-11 14:09:08 +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
abd5a74e4c Merge branch 'master' into 9587_annotation_tags_wih_temp_var
* master: (3328 commits)
  removes protoc from makefile
  changelog: note about closing #11681
  Adding Centrify configuration for Oauth
  refactor: moved stuff into new features dir manage-dashboards
  move: moved styleguide to admin
  fix: fixed singlestat test broken due to file move
  moved folders from features into the main feature folder they belong to
  Add jsonnet with grafonnet-lib to provisioning docs
  fix: Dashboard permissions now shows correctly, fixes #13201
  Update CHANGELOG.md
  redux: do not use redux logger middleware in production builds
  Allow oauth email attribute name to be configurable (#13006)
  Document required order for time series queries (#13204)
  refactor: changed AlertRuleItem pause action to callback
  Fix query builder queries for interval start
  renaming things in admin
  release 5.2.4
  changelog: release 5.2.4
  refactoring: custom scrollbars PR updated, #13175
  changelog: add notes about closing #13121
  ...
2018-09-11 11:04:29 +02:00
bergquist
2936e34d75 removes protoc from makefile 2018-09-11 10:53:21 +02:00
Torkel Ödegaard
61112d93d8 wip: folder to redux 2018-09-11 10:36:55 +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
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