bergquist
75f832cda8
use alert state changes counter as secondary version
2018-10-01 15:58:30 +02:00
Marcus Efraimsson
1be8fb76b8
cleanup alert_notification_state when deleting alert rules and channels
2018-09-30 21:57:15 +02:00
Marcus Efraimsson
5ec086dc56
don't notify if notification state pending
...
If notification state is pending and last update of state was made
less than a minute ago. In the case of a grafana instance is shut down/crashes
between setting pending state and before sending the notification/marks as complete
this logic should allow the notification to be sent after some time instead of
being left in an inconsistent state where no notifications are being sent.
2018-09-30 21:52:50 +02:00
Marcus Efraimsson
d412aafb7e
remove unused code
2018-09-30 20:16:01 +02:00
Marcus Efraimsson
d313ffa847
devenv: enable some debug logging for ha test setup
2018-09-28 18:35:43 +02:00
Marcus Efraimsson
8551ffa0b0
alert -> ok with reminders enabled should send
2018-09-28 18:34:20 +02:00
Marcus Efraimsson
a0e1a1a1f9
Merge remote-tracking branch 'origin/master' into reminder_refactoring
2018-09-28 15:17:30 +02:00
Marcus Efraimsson
fda8a08e0b
Merge pull request #13439 from grafana/ha_setup
...
Grafana high availability (ha) test setup
2018-09-28 15:16:47 +02:00
Marcus Efraimsson
67c58fa5e4
fix set sent_at on complete
2018-09-28 15:11:03 +02:00
Marcus Efraimsson
c1763508e0
handle pending and completed state for alert notifications
2018-09-28 14:22:03 +02:00
Marcus Efraimsson
2bf399d3c8
No need to get alert notification state in ShouldNotify
2018-09-28 12:59:35 +02:00
Marcus Efraimsson
69cc24ea3f
wip: test get alert notification state
2018-09-28 11:17:03 +02:00
Marcus Efraimsson
88bbc452a7
wip: send and mark as complete
2018-09-28 11:14:36 +02:00
Leonard Gram
1a75aa54de
wip: impl so that get alertstate also creates it if it does not exist
2018-09-28 10:48:08 +02:00
Torkel Ödegaard
abefadb333
fix: preloader element issue
2018-09-28 09:30:56 +02:00
Torkel Ödegaard
5eef2fe05b
Merge pull request #13458 from skreii/master
...
Adding AWS Isolated Regions
2018-09-28 09:14:43 +02:00
Steve Kreitzer
55e4db5cfc
Adding AWS Isolated Regions
2018-09-27 19:58:07 -04:00
bergquist
15ce474639
wip
2018-09-27 16:21:53 +02:00
Torkel Ödegaard
5eede26a24
Merge pull request #13438 from grafana/plugin-list-to-react
...
Plugin list to react
2018-09-27 15:50:55 +02:00
Torkel Ödegaard
8b4dbbe0bd
Merge pull request #13448 from grafana/davkal/typecheck-precommit
...
Compile TS on precommit hook
2018-09-27 15:36:50 +02:00
David Kaltschmidt
88f36cbd22
Compile TS of the whole project to detect type errors
...
- was not covered by TS lint
- TS errors are only noticed in broken builds
- added grunt task to run `tsc --noEmit`
2018-09-27 15:15:41 +02:00
Torkel Ödegaard
5873a71324
Update CHANGELOG.md
2018-09-27 14:58:46 +02:00
Peter Holmberg
11ee65d35a
deletez
2018-09-27 14:51:00 +02:00
Torkel Ödegaard
7d44aacf4a
refactoring: slight changes to PR #13247
2018-09-27 14:50:14 +02:00
Peter Holmberg
b899a0e1c1
revert rename
2018-09-27 14:45:36 +02:00
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
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
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
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
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
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
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
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
Marcus Efraimsson
869e36995a
Merge pull request #13427 from svenklemm/postgres-suggest-null-fix
...
filter NULL values in column value suggestion query
2018-09-26 16:21:11 +02:00
Leonard Gram
5cf0fb49bb
Merge pull request #13402 from bergquist/alert_notifier_reminder
...
alerting: move all notification conditions to defaultShouldNotify
2018-09-26 15:36:39 +02:00