Torkel Ödegaard
f2307f92de
Merge branch 'text_variable-3173' of https://github.com/daldoyle/grafana into daldoyle-text_variable-3173
2018-09-27 14:36:37 +02:00
Peter Holmberg
327cdf34d5
using constant
2018-09-27 14:32:54 +02:00
Daniel Lee
ea1859a374
stackdriver: extract out filter, metric type directive
2018-09-27 14:31:39 +02:00
Erik Sundell
92f50ca384
stackdriver: add unit tests to resolve unit function
2018-09-27 14:24:28 +02:00
Peter Holmberg
fede5e6c74
rename to pluginlistitem
2018-09-27 14:23:46 +02:00
Peter Holmberg
cabc4c4bfe
fixing types
2018-09-27 14:19:36 +02:00
Erik Sundell
251bb09aed
stackdriver: convert most common stackdriver units to grafana units if possible
2018-09-27 14:03:52 +02:00
Torkel Ödegaard
92172566cb
Merge pull request #13445 from grafana/explore-dark-theme-fixes
...
fixes to dark theme for Explore mode
2018-09-27 13:43:51 +02:00
Marcus Efraimsson
d093244282
sqlstore: add support for checking if error is constraint validation error
2018-09-27 13:38:22 +02:00
Peter Holmberg
1e2c06083a
rewrote to use react.sfc
2018-09-27 12:15:41 +02:00
Torkel Ödegaard
5c24fa68a5
explore: fixes to dark theme, fixes #13349
2018-09-27 11:57:28 +02:00
Johannes Schill
362010c438
Remove angular code related to API Keys and point the route to the React component #13411
2018-09-27 11:53:19 +02:00
Johannes Schill
c7fb6916b9
Open modal with API key information after key is added #13411
2018-09-27 11:53:19 +02:00
Johannes Schill
a94662c8c7
Add tests for the reducers & selectors for API keys #13411
2018-09-27 11:53:19 +02:00
Johannes Schill
32fb24f248
Update test-snapshot, remove dead code #13411
2018-09-27 11:53:19 +02:00
Johannes Schill
60866d16b1
Add tests for ApiKeysPage #13411
2018-09-27 11:53:19 +02:00
Johannes Schill
e3d579e410
Add "search box" and a "add new" box to the new API Keys page #13411
2018-09-27 11:53:19 +02:00
Johannes Schill
cc0802cc39
Pick up the type from app/types
2018-09-27 11:53:19 +02:00
Johannes Schill
97d718f87a
Pick up the type from app/types
2018-09-27 11:53:18 +02:00
Johannes Schill
e8ba35ab2d
Move User type out of UserPicker and into app/types
2018-09-27 11:53:18 +02:00
Johannes Schill
353a836128
wip: Reactify the api keys page #13411
2018-09-27 11:53:18 +02:00
bergquist
c5278af6c4
add support for mysql and postgres unique index error codes
2018-09-27 11:33:13 +02:00
Torkel Ödegaard
31b8bf2d47
Merge pull request #13380 from grafana/13275-pending-invites
...
switch button for org users
2018-09-27 11:26:07 +02:00
bergquist
3fab616239
implement sql queries for transactional alert reminders
2018-09-27 11:14:44 +02:00
Erik Sundell
e2bda4d321
stackdriver: fix typescript errors
2018-09-27 10:55:11 +02:00
Erik Sundell
b724ca5b93
stackdriver: pass interval from panel to backend
2018-09-27 10:42:28 +02:00
Erik Sundell
c099074d2c
stackdriver: remove debug logging
2018-09-27 10:41:51 +02:00
Erik Sundell
0507ff69fb
stackdriver: resolve merge conflict
2018-09-27 10:32:30 +02:00
Erik Sundell
c14c848819
stackdriver: update docs so that they align with alignment period rules in stackdriver gui
2018-09-27 10:23:37 +02:00
Erik Sundell
481b8653d9
stackdriver: update alignment period rules according to stackdriver
2018-09-27 10:20:01 +02:00
Daniel Lee
6358d3f314
stackdriver: set target to be raw query
2018-09-27 10:14:10 +02:00
Daniel Lee
d405d8f255
stackdriver: publish docs to v5.3 (not root)
2018-09-27 10:14:10 +02:00
bergquist
ff79f80685
initial rename refactoring
2018-09-27 09:43:00 +02:00
bergquist
0476520f2d
changelog: adds note about closing #12534
2018-09-27 09:25:57 +02:00
Marcus Efraimsson
f6b8d3a1c2
devenv: grafana high availability (ha) test setup
2018-09-27 09:24:40 +02:00
Carl Bergquist
464f3f738f
Merge pull request #13360 from sapcc/symlinks
...
resolve symlink on each run
2018-09-27 09:21:29 +02:00
Erik Sundell
3c6c456592
stackdriver: use more appropriate test data
2018-09-27 09:19:24 +02:00
Torkel Ödegaard
dbec2ded25
Update CHANGELOG.md
2018-09-27 09:15:23 +02:00
Torkel Ödegaard
a6b32305e9
Merge pull request #12219 from PrincipalsOffice/fix-#12030
...
Prevent refresh on fixed time window
2018-09-27 09:14:02 +02:00
Torkel Ödegaard
c962fb675e
Merge pull request #13432 from mjtrangoni/add-goconst-circleci
...
Add goconst to CircleCI
2018-09-27 08:41:36 +02:00
ryan
b4fad40c5a
Merge remote-tracking branch 'grafana/master' into proxy-slash
...
* grafana/master: (127 commits)
alerting: move all notification conditions to defaultShouldNotify
filter NULL values for column value suggestions
imguploader: Add support for ECS credential provider for S3
Remove .dropdown-menu-open on body click fixes #13409
Remove option r from ln command since its not working everywhere
fix: updated tests
Fix spelling of your and you're
Changed setting to be an alerting setting
Remove non-existing css prop
fix: Legend to the right, as table, should follow the width prop. Removing css conflicting with baron's width calculation. #13312
rendering: Added concurrent rendering limits
devenv: fix uid for bulk alert dashboards
Explore: moved code to app/features/explore
target gfdev-prometheus datasource
devenv: adds script for creating many dashboards with alerts
Fix goconst issues
When stacking graphs, always include the y-offset so that tooltips can render proper values for individual points
provisioning: changed provisioning default update interval from 3 to 10 seconds
Fix https://github.com/grafana/grafana/issues/13387 metric segment options displays after blur
docs: improve oauth generic azure ad instructions
...
2018-09-26 20:24:08 -07:00
Mario Trangoni
803e716213
Add goconst to CircleCI
2018-09-26 22:43:15 +02:00
Torkel Ödegaard
283f693600
fix: also set dashboard refresh to false
2018-09-26 13:13:00 -07:00
Torkel Ödegaard
0f4904038e
simplified fix for 12030
2018-09-26 13:08:55 -07:00
Jiang Ye
4c4e5533a1
prevent refresh on fixed time window
2018-09-26 13:08:55 -07:00
Peter Holmberg
32389f6171
using more variables
2018-09-26 21:27:14 +02:00
Torkel Ödegaard
ec4b165b3c
Merge pull request #13392 from mjtrangoni/fix-goconst-issues
...
Fix goconst issues
2018-09-26 20:12:44 +02:00
Torkel Ödegaard
5a2b1b1abf
Merge pull request #13424 from aidan-/master
...
imguploader: Add support for ECS credential provider for S3
2018-09-26 20:05:04 +02:00
Erik Sundell
284d0b7edf
Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin
2018-09-26 18:04:30 +02:00
Erik Sundell
75a2ea5c71
stackdriver: fix broken test
2018-09-26 18:04:04 +02:00
