Commit Graph

16119 Commits

Author SHA1 Message Date
Torkel Ödegaard 06855d2bc3 Merge pull request #13253 from grafana/13240_auth_stats
Fix anonymous usage stats for authentication types
2018-09-13 21:17:16 +02:00
Torkel Ödegaard 4b0eeab2b3 Merge pull request #13259 from bergquist/disable_metrics_endpoint
[metrics]enabled = false should disable the /metrics endpoint.
2018-09-13 21:14:28 +02:00
Carl Bergquist ec5aa332ac removes old unused examples (#13260)
Just wanted to reduce the amount of files/folders in root
2018-09-13 21:09:21 +02:00
Torkel Ödegaard fbfcc62269 fix: added loading screen error scenario (#13256) 2018-09-13 21:08:41 +02:00
David Kaltschmidt 379227c75d Updated CHANGELOG.md 2018-09-13 17:52:28 +02:00
Marcus Efraimsson e33b2d5fce changelog: add notes about closing #11555
[skip ci]
2018-09-13 17:29:37 +02:00
David d67d890ccc Merge pull request #11789 from mtanda/prom_annotation_series_timestamp
(prometheus) add annotation option to treat series value as timestamp
2018-09-13 17:21:12 +02:00
Sven Klemm 0254a29e35 Interpolate $__interval in backend for alerting with sql datasources (#13156)
add support for interpolate $__interval and  $__interval_ms in sql datasources
2018-09-13 16:51:00 +02:00
Marcus Efraimsson 1d66f9a42c anonymous usage stats for authentication types 2018-09-13 16:36:23 +02:00
bergquist bff350166e disabling internal metrics disables /metric endpoint
but we will still keep sending metrics to graphite

closes #10638
2018-09-13 16:09:52 +02:00
Torkel Ödegaard bae560717d fix: fixed tslint issue introduced in recent prometheus PR merge 2018-09-13 14:23:43 +02:00
Torkel Ödegaard f2edb82e79 Folder pages to redux (#13235)
* 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

* wip: began folder to redux migration

* team settings

* actions for group sync

* wip: progress on redux folder store

* wip: folder to redux

* wip: folder settings page to redux progress

* mobx -> redux: major progress on folder migration

* redux: moved folders to it's own features folder

* fix: added loading nav states

* fix: gofmt issues

* wip: working on reducer test

* fix: added reducer test
2018-09-13 14:10:51 +02:00
Mitsuhiro Tanda dc08093f6c minor fix 2018-09-13 20:15:33 +09:00
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