Torkel Ödegaard
c42a232644
Merge branch 'react-mobx'
2018-01-04 09:12:57 +01:00
Trent White
ee05ea8d60
new add alert notification channel icon
2018-01-03 14:23:14 -05:00
Patrick O'Carroll
58e0bdd71f
added empty list cta to notification channels, fixes 10393 ( #10400 )
2018-01-02 12:16:38 +01:00
Torkel Ödegaard
8f50795a94
tech: url and query mobx store so now react components and containers can read and modify url path and query via mobx store
2017-12-31 22:31:11 +01:00
Torkel Ödegaard
4c1a67c34e
tech: began reworking alerting list to mobx
2017-12-28 18:49:33 +01:00
Torkel Ödegaard
3a1f52d8a2
prettier: ran on all files again, sorry. now settings are defined in package.json
2017-12-21 08:39:31 +01:00
Torkel Ödegaard
85879a7014
prettier: change to single quoting
2017-12-20 12:33:33 +01:00
Torkel Ödegaard
fadfc665e4
tech: ran pretttier on all typescript files
2017-12-19 16:06:54 +01:00
Torkel Ödegaard
75bfe313d7
Merge remote-tracking branch 'origin/develop-filter-table' into develop
2017-12-15 11:44:51 +01:00
Patrick O'Carroll
33f2e31393
replaced old table with filter-table, removed edit button, made whole rows to links
2017-12-14 14:30:13 +01:00
Torkel Ödegaard
75bb894485
ux: new page-header design, most pages beside admin done
2017-12-01 11:32:00 +01:00
Torkel Ödegaard
32ffb2d544
progress on page header
2017-12-01 10:27:05 +01:00
Torkel Ödegaard
74ceb76ec0
ux: work on page header
2017-11-30 15:37:03 +01:00
Torkel Ödegaard
645f49eda4
ux: updating header design for pages
2017-11-30 11:31:38 +01:00
Torkel Ödegaard
e98af1b3fa
updated libs and fixed new typescript errors
2017-11-27 12:14:57 +01:00
Torkel Ödegaard
0e44fe082b
Merge branch 'master' into develop
2017-11-17 15:49:17 +01:00
Torkel Ödegaard
1a3170373a
Merge branch 'alertList-notOK'
2017-11-15 10:48:20 +01:00
Anton Huck
fd2451823b
Add Microsoft Teams notifier
2017-11-14 11:05:01 +01:00
Patrick O'Carroll
9ad186bcc9
not ok option to alert list, fixes : #9754
2017-11-13 10:30:11 +01:00
Torkel Ödegaard
d8230f8fa7
Merge branch 'master' into develop
2017-10-17 11:17:28 +02:00
bergquist
9de4d0fa6b
alert_tab: clear test result when testing rules
...
closes #9539
2017-10-16 10:31:09 +02:00
Torkel Ödegaard
48b6692491
ux: minor button changes
2017-10-15 12:25:31 +02:00
bergquist
ec14fa58b5
alerting: add count_non_null reducer
...
makes it possible to have a second condition requering
at least X points of data.
2017-10-13 09:47:10 +02:00
Torkel Ödegaard
88ceb19d96
Merge branch 'master' into develop
2017-10-12 16:32:44 +02:00
Carl Bergquist
b63725033e
Merge pull request #9450 from utkarshcmu/kafka_alert
...
Kafka alerting
2017-10-12 12:11:13 +02:00
Patrick O'Carroll
b76de790f9
fixed minor styling issus ( #9497 )
...
* fixed minor styling issus
* fixed code formatting
2017-10-12 10:33:42 +02:00
utkarshcmu
d60339a9b1
Kafka REST Proxy works with Grafana
2017-10-09 18:27:04 -07:00
Torkel Ödegaard
647a3cc5ae
Merge branch 'master' into develop
2017-10-09 16:01:54 +02:00
Torkel Ödegaard
25aa9df270
Create annotations ( #8197 )
...
* annotations: add 25px space for events section
* annotations: restored create annotation action
* annotations: able to use fa icons as event markers
* annotations: initial emoji support from twemoji lib
* annotations: adjust fa icon position
* annotations: initial emoji picker
* annotation: include user info into annotation requests
* annotation: add icon info
* annotation: display user info in tooltip
* annotation: fix region saving
* annotation: initial region markers
* annotation: fix region clearing (add flot-temp-elem class)
* annotation: adjust styles a bit
* annotations: minor fixes
* annoations: removed userId look in loop, need a sql join or a user cache for this
* annotation: fix invisible events
* lib: changed twitter emoij lib to be npm dependency
* annotation: add icon picker to Add Annotation dialog
* annotation: save icon to annotation table
* annotation: able to set custom icon for annotation added by user
* annotations: fix emoji after library upgrade (switch to 72px)
* emoji: temporary remove bad code points
* annotations: improve icon picker
* annotations: icon show icon picker at the top
* annotations: use svg for emoji
* annotations: fix region drawing when add annotation editor opened
* annotations: use flot lib for drawing region fill
* annotations: move regions building into event_manager
* annotations: don't draw additional space if no events are got
* annotations: deduplicate events
* annotations: properly render cut regions
* annotations: fix cut region building
* annotations: refactor
* annotations: adjust event section size
* add-annotations: fix undefined default icon
* create-annotations: edit event (frontend part)
* fixed bug causes error when hover event marker
* create-annotations: update event (backend)
* ignore grafana-server debug binary in git (created VS Code)
* create-annotations: use PUT request for updating annotation.
* create-annotations: fixed time format when editing existing event
* create-annotations: support for region update
* create-annotations: fix bug with limit and event type
* create-annotations: delete annotation
* create-annotations: show only selected icon in edit mode
* create-annotations: show event editor only for users with at least Editor role
* create-annotations: handle double-sized emoji codepoints
* create-annotations: refactor
use CP_SEPARATOR from emojiDef
* create-annotations: update emoji list, add categories.
* create-annotations: copy SVG emoji into public/vendor/npm and use it as a base path
* create-annotations: initial tabs for emoji picker
* emoji-picker: adjust styles
* emoji-picker: minor refactor
* emoji-picker: refactor - rename and move into one directory
* emoji-picker: build emoji elements on app load, not on picker open
* emoji-picker: fix emoji searching
* emoji-picker: refactor
* emoji-picker: capitalize category name
* emoji-picker: refactor
move buildEmojiElem() into emoji_converter.ts for future reuse.
* jquery.flot.events: refactor
use buildEmojiElem() for making emojis, remove unused code for font awesome based icons.
* emoji_converter: handle converting error
* tech: updated
* merged with master
* shore: clean up some stuff
* annotation: wip tags
* annotation: filtering by tags
* tags: parse out spaces etc. from a tags string
* annotations: use tagsinput component for tag filtering
* annotation: wip work on how we query alert & panel annotations
* annotations: support for updating tags in an annotation
* linting
* annotations: work on unifying how alert history annotations and manual panel annotations are created
* tslint: fixes
* tags: create tag on blur as well
Currently, the tags directive only creates the tag when the
user presses enter. This change means the tag is created on
blur as well (when the user clicks outside the input field).
* annotations: fix update after refactoring
* annotations: progress on how alert annotations are fetched
* annotations: minor progress
* annotations: progress
* annotation: minor progress
* annotations: move tag parsing from tooltip to ds
Instead of parsing a tag string into an array in the annotation_tooltip
class, this moves the parsing to the datasources. InfluxDB ds already
does that parsing. Graphite now has it.
* annotations: more work on querying
* annotations: change from tags as string to array
when saving in the db and in the api.
* annotations: delete tag link if removed on edit
* annotation: more work on depricating annotation title
* annotations: delete tag links on delete
* annotations: fix for find
* annotation: added user to annotation tooltip and added alertName to annoation dto
* annotations: use id from route instead from cmd for updating
* annotations: http api docs
* create annotation: last edits
* annotations: minor fix for querying annotations before dashboard saved
* annotations: fix for popover placement when legend is on the side (and doubel render pass is causing original marker to be removed)
* annotations: changing how the built in query gets added
* annotation: added time to header in edit mode
* tests: fixed jshint built issue
2017-10-07 10:31:39 +02:00
Torkel Ödegaard
d38c891fac
merge with master
2017-10-02 14:14:45 +02:00
Torkel Ödegaard
1dea7dab2a
shore: fixed html indentation, #9368
2017-10-02 08:51:45 +02:00
Torkel Ödegaard
a22dded6fa
Merge branch 'update-alert-lists' of https://github.com/Ijin08/grafana into Ijin08-update-alert-lists
2017-10-02 08:43:56 +02:00
coral
68ed4d45fa
change pdiff to percent_diff for conditions
2017-09-29 18:14:17 +08:00
coral
9e48d54465
add diff and pdiff for conditions
2017-09-29 17:20:02 +08:00
Torkel Ödegaard
5849fbf04e
Merge branch 'master' of github.com:grafana/grafana into develop
2017-09-28 10:37:57 +02:00
Patrick O'Carroll
0d5540ca09
cleaned up html/sass and added final touches
2017-09-28 09:41:33 +02:00
bergquist
5373a6027c
alertlist: toggle play/pause button
...
closes #9355
2017-09-27 10:49:39 +02:00
Patrick O'Carroll
8615912018
updated css and html for recent state changes for alert lists
2017-09-27 10:38:01 +02:00
Torkel Ödegaard
7b42e13c79
typescript: stricter typescript option
2017-09-26 11:24:58 +02:00
Torkel Ödegaard
18337f610d
Merge branch 'master' into develop
2017-09-22 08:42:07 +02:00
Torkel Ödegaard
b8d9722b4f
tech: removing unused variables from typescript files, and making tslint rules more strict
2017-09-21 16:40:18 +02:00
Torkel Ödegaard
a95d587c96
ux: minor updates
2017-08-20 21:23:41 +02:00
Torkel Ödegaard
21a7f57248
ux: changed cta button style
2017-08-20 21:16:40 +02:00
Torkel Ödegaard
d659a5d79f
ux: more nav work
2017-08-15 20:53:31 +02:00
Torkel Ödegaard
0bc226d760
ux: more nav work
2017-08-15 20:24:16 +02:00
Torkel Ödegaard
9fb60c2fc8
Merge branch 'develop' into panel-title-menu-ux
2017-08-02 09:56:08 +02:00
squain
ede6d71e72
Fix typo in alert_howto.html ( #8964 )
2017-07-31 21:16:39 +02:00
Alexander Zobnin
af56cc4c28
Panel Alertlist: use dashboard timezone ( #8880 )
...
* panel-alertlist: use dashboard timezone, fixes #8874
* alert state history: use dashboard timezone, issue #8874
* alert state history: minor refactor
2017-07-19 20:45:57 +02:00
Daniel Lee
7ea5930a90
alerting: minor fix
2017-06-29 12:18:10 +02:00
Torkel Ödegaard
81abfd4ca4
minor update
2017-06-14 10:00:40 -04:00
Torkel Ödegaard
e9d5e037e8
ux: merge branch navbarv2, new navbar with dashboard search available on all pages, closes #6475
2017-06-02 14:00:42 +02:00
Torkel Ödegaard
a0b9dcad4d
alert: alerting annotation improvements, fixes #8421
2017-05-22 13:02:49 +02:00
Torkel Ödegaard
8918922179
alerting: fixed issue with included alerting error & no data reasons, fixes #8412
2017-05-18 14:10:12 +02:00
Torkel Ödegaard
f84dc24fcb
alerting: improving and fixing alert history, #7257
2017-05-15 16:17:05 +02:00
Torkel Ödegaard
4a2efb1007
alerting: removed width restriction on message, fixes #8000
2017-03-31 23:07:57 +02:00
Torkel Ödegaard
952cc1d883
alerting: fixed width of query component in alert tab
2017-03-09 12:56:49 +01:00
Carl Bergquist
bef216b6f4
Merge pull request #7526 from Mic92/master
...
Add Pushover alert notifications
2017-02-24 07:32:59 +01:00
bergquist
c924510deb
alertlist: adds pause as filter option
...
closes #7400
2017-02-16 16:01:57 +01:00
bergquist
bd010289b2
alerting: images in alert notifications is now optional
...
its now possible to turn of image uploading in alert notifications
for those who operate on very sensitive data.
closes #7419
2017-02-15 14:17:36 +01:00
Jörg Thalheim
f069aae576
Add Pushover alert notifications
...
Pushover is a service for getting real-time
notifications on your mobile devices and desktop
computers: https://pushover.net
2017-02-10 22:44:33 +01:00
bergquist
00549f393c
style(hipchat): improves code style
2017-02-08 11:24:49 +01:00
bergquist
a580113de4
feat(alerting): changes default timerange to 15min
2017-02-02 12:05:44 +01:00
bergquist
163036591d
tech(build): fixes broken build
2017-01-30 15:04:55 +01:00
bergquist
e78da57e4d
feat(alerting): shows when no_data triggered alerts
...
closes #7035
ref #7257
2017-01-17 09:49:25 +01:00
bergquist
f29f83ca75
chore: adds comment out why the code was added
2017-01-16 15:04:53 +01:00
bergquist
3c9357a2e9
fix(alerting): supports lowercase metrics
...
this fix is due to EvalMatch now serailize as lower case.
ref #7257
2017-01-16 15:01:57 +01:00
Torkel Ödegaard
b8f559aecb
feat(plugins): made notifiers more pluggable and easier to support many of them, new ones can now be added without modifying any existing file, #7162
2017-01-06 12:04:25 +01:00
Mikhail Leonov
e32a653cb6
Added Telegram Messenger notification destination
2016-12-30 15:57:12 +03:00
bergquist
ba96b88b66
feat(alerting): adds 24h and 48h duration as pre defined values
...
ref #7007
2016-12-20 09:23:05 +01:00
bergquist
faa3b5f4e8
feat(alertlist): adds sorting on state
...
closes #6676
2016-12-15 16:29:40 +01:00
bergquist
ca7baca21d
feat(alerting): adds ok as no data option
...
closes #6866
2016-12-15 11:13:19 +01:00
bergquist
76f78c0f72
test(alert_tab): basic test skeleton
...
I created this test by misstake. But instead of deleting it I thought it
might be good to keep it to make it easier to add tests for the alert
tab
2016-12-13 09:50:38 +01:00
Kyle McCullough
4ef940482c
alerting: add support for OpsGenie
2016-12-06 14:48:13 -06:00
bergquist
a6ea2f4fdb
Merge branch 'victorops' of https://github.com/ichekrygin/grafana into ichekrygin-victorops
2016-11-29 22:22:25 +01:00
bergquist
56156fcd7f
feat(alerting): add median reducer to frontend
2016-11-22 14:35:26 +01:00
Torkel Ödegaard
62e8a039a1
refactor(alerting): refactoring PR for OR conditions, #6579
2016-11-17 15:48:15 +01:00
ichekrygin
8f0d51171d
Resolve rebase w/ upstream conflicts.
...
Remove: `Alert on Exec Error` (no longer needed)
Add: `ruleUrl` to VictorOps message body.
2016-11-16 16:13:33 -08:00
ichekrygin
b46cbc5fbe
Add option to alert on ExecutionError
2016-11-16 14:02:34 -08:00
ichekrygin
4ca304b756
Change VictorOps fa from fa-exclamation-triangle
-> fa-pagelines
2016-11-16 14:02:34 -08:00
ichekrygin
1e558e3936
Fix user-facing text
2016-11-16 14:02:34 -08:00
ichekrygin
b0620a9d4b
Add VictorOps alert notification capability
2016-11-16 14:02:34 -08:00
utkarshcmu
b2db2b26dd
Added OR to alert_tab
2016-11-14 18:36:22 -08:00
bergquist
eb34855adb
feat(pagerduty): add support for auto resolve
...
closes #6513
2016-11-08 20:38:38 +01:00
Torkel Ödegaard
fd09f17cd3
docs(): alerting docs, #6490
2016-11-08 14:53:28 +01:00
Torkel Ödegaard
dea5fd385f
ux(alerting): minor wording change on alert tab
2016-11-08 09:34:52 +01:00
utkarshcmu
74632b5e98
Added last function for alerting conditions
2016-11-07 23:16:57 -08:00
bergquist
6dd076efc1
Merge branch 'alerting_pagerduty' of https://github.com/utkarshcmu/grafana into utkarshcmu-alerting_pagerduty
2016-11-08 07:48:20 +01:00
utkarshcmu
a7e67f3bdd
Removed invalid alerting state
2016-11-07 17:43:13 -08:00
utkarshcmu
f8d1eb11a9
Removed ExecError state
2016-11-07 07:12:43 -08:00
utkarshcmu
638d3bcb42
Removed NoData option
2016-11-07 07:08:51 -08:00
utkarshcmu
df8cd764b2
Added trigger options with Pagerduty
2016-11-07 07:08:51 -08:00
utkarshcmu
139bbecc10
Added Pagerduty basic alerting
2016-11-07 07:08:51 -08:00
bergquist
b2d8e83c7d
fix(alert_tab): better execution state description
2016-11-07 14:54:42 +01:00
bergquist
489f087fbd
feat(alerting): reduce states. Make exeuction result configurable.
...
ref #6444
2016-11-07 12:42:39 +01:00
Torkel Ödegaard
2d19af601a
fix(alerting): various alerting fixes
2016-11-06 15:40:02 +01:00
utkarshcmu
2f60929d1e
Added slack mention functionality
2016-11-04 06:05:44 -07:00
Torkel Ödegaard
2da2d5df56
Merge branch 'master' of github.com:grafana/grafana
2016-11-04 12:15:08 +01:00
utkarshcmu
2b28cf1ff1
Fixed the tooltip message for slack notifier
2016-11-02 12:42:33 -07:00
Carl Bergquist
e659eb745d
Merge pull request #6420 from utkarshcmu/alerting_initial_state
...
Alerts not sent when state is changed from "initialized" to "ok"
2016-11-01 18:30:14 +01:00
utkarshcmu
7490c49f60
Alert un paused to pending state
2016-11-01 07:58:38 -07:00
bergquist
63e2337f6c
feat(alerting): change placeholder to info-popover
2016-11-01 08:46:31 +01:00
utkarshcmu
80fdd830de
Added override default recipient functionality
2016-10-31 14:46:51 -07:00
Torkel Ödegaard
4d420a0c33
refactor(): dashboard row model and hunting down memory leak
2016-10-30 15:14:18 +01:00
Carl Bergquist
bc90e6ce46
Alerting: Keep last state on no data ( #6354 )
...
* feat(alerting): add support to keep last state on no data
closes #6332
* refactoring(alerting PR #6354 ): added new option type for NoData option so AlertStateType does not have to contain invalid state, #6354
2016-10-22 10:56:04 +02:00
bergquist
ad56f67ad1
feat(alerting): add support to keep last state on no data
...
closes #6332
2016-10-21 14:00:20 +02:00
utkarshcmu
b989b08781
Fixed typo
2016-10-20 02:22:37 -07:00
bergquist
f2cbfece2c
feat(notification): add helptext for using multiple email addresses
2016-10-19 17:04:17 +02:00
bergquist
d1eceedf55
feat(webhook): add httpmethod to webhook
...
closes #6255
2016-10-18 16:50:16 +02:00
Torkel Ödegaard
c9d7eb0a7a
feat(alerting): added clear history button to alert state history view, #6244
2016-10-14 09:33:42 +02:00
bergquist
5a39bf5c58
fix(alert_tab): dont add dup notifications to repeater
...
closes #6233
2016-10-12 11:27:49 +02:00
bergquist
0d4b00df95
feat(alerting): add template validation for influxdb
...
closes #6230
2016-10-11 16:03:00 +02:00
bergquist
446bde2421
Merge branch 'pause_alert_rules'
...
closes #6135
2016-10-11 10:54:58 +02:00
bergquist
c6cf7647ff
feat(alerting): pausing alerts requires alert id
2016-10-11 10:53:24 +02:00
Torkel Ödegaard
7b70e0ff3a
fix(UI): fixed 3 UI bugs, fixes #6225
2016-10-11 09:51:43 +02:00
bergquist
8b0c29b104
Merge branch 'master' into pause_alert_rules
2016-10-11 09:46:48 +02:00
bergquist
4bbc2108f9
feat(alerting): add pause button to alert list
2016-10-11 09:45:38 +02:00
bergquist
804797245d
feat(alerting): make it possible to pause from alert tab
2016-10-11 08:40:38 +02:00
Torkel Ödegaard
d4fd1c82e3
fix(alerting): added step any to alert threshold input fields, fixes #6205
2016-10-10 19:47:16 +02:00
bergquist
f3825263d4
feat(alerting): add pause button in alert list
2016-10-10 15:17:14 +02:00
Torkel Ödegaard
4ec2377e09
fix(notifications): added form validation and restored Send Test button which was always hidden, #6159
2016-10-01 17:14:45 +02:00
bergquist
91b180168e
tech(notifications): remove unused filter markup
2016-10-01 15:51:08 +02:00
Torkel Ödegaard
7c339f0794
feat(alerting): show alertin state in panel header, closes #6136
2016-09-30 17:37:47 +02:00
Torkel Ödegaard
fe4a0a98c1
fix(alerting): added confirm modal in UI, when deleting alert
2016-09-30 13:00:16 +02:00
Torkel Ödegaard
22e8885690
feat(testdata): progress on test data stuff
2016-09-27 18:36:00 +02:00
bergquist
43d8bd5a25
feat(prometheus): initial support for prometheus
2016-09-21 07:01:53 +02:00
bergquist
d0f9623037
feat(alertlistpanel): support state filter
...
ref #5981
2016-09-14 10:49:05 +02:00
bergquist
b49a642ca5
feat(alerting): extract method for join eval matches
2016-09-14 10:49:05 +02:00
Torkel Ödegaard
0fa0066cd9
tech(lodash): began migration work
2016-09-13 22:10:44 +02:00
Torkel Ödegaard
f5809c0209
fix(build): trying to fix build
2016-09-13 20:14:18 +02:00
Torkel Ödegaard
9cd517780f
Merge branch 'master' of github.com:grafana/grafana
2016-09-13 16:25:48 +02:00
Torkel Ödegaard
3af891d023
feat(alerting): restored alert history
2016-09-13 16:13:41 +02:00
Torkel Ödegaard
b0c7e61ef8
feat(alerting): removed severity
2016-09-13 15:09:55 +02:00
bergquist
6a723dff37
feat(notifications): set default value to false for new notifications
2016-09-13 14:25:48 +02:00
Torkel Ödegaard
b8081b29fd
Merge branch 'master' into grafana-annotations
2016-09-08 11:26:55 +02:00
Torkel Ödegaard
d60bd77658
feat(annotations): added support to show grafana stored annotations in graphs, #5982
2016-09-08 11:25:45 +02:00
bergquist
f56d45ac56
feat(alerting): include default notifications in alert tab
2016-09-07 15:13:24 +02:00
Torkel Ödegaard
fc8f0721cd
Merge branch 'master' of github.com:grafana/grafana
...
Conflicts:
pkg/services/alerting/eval_context.go
2016-09-06 20:40:49 +02:00
Torkel Ödegaard
fbae6abb3c
feat(alerting): progress on handling no data in alert query, #5860
2016-09-06 20:40:12 +02:00
bergquist
22805ce56b
fix(alert_tab): fix broken alert history
2016-09-06 14:42:34 +02:00
bergquist
55b560a4a8
feat(alerting): filter notifications based on severity
...
closes #5851
2016-09-06 14:27:48 +02:00
Torkel Ödegaard
6b17cdbca6
feat(alerting): Save As removes alerts from panels, closes #5965
2016-09-06 09:14:11 +02:00
bergquist
c893e5d241
feat(notifications): add support for default notifications
...
ref #5883
2016-09-05 21:35:37 +02:00
bergquist
d11bc57c37
feat(notifications): make it possible to send test alert notifications
...
closes #5847
2016-09-05 14:45:15 +02:00
bergquist
daea38060f
feat(notifications): redirect to notification list after creation.
2016-09-05 08:27:12 +02:00
bergquist
e493015f54
fix(alerting): replace one hack with another hack
2016-08-31 10:10:39 +02:00
bergquist
53a9dec407
feat(alerting): move timestamp to new row
...
ref #5850
2016-08-31 09:48:58 +02:00
bergquist
b55b7cde4b
fix(alerting): remove error message when model is valid again
...
closes #5921
2016-08-30 13:36:13 +02:00
bergquist
11a4ff0f8a
feat(alerting): add basic UI for history in alert tab
...
ref #5850
2016-08-30 13:22:59 +02:00
bergquist
f3d6035c59
feat(alerting): add alerts for notification edits
2016-08-22 14:49:40 +02:00
bergquist
5a33679470
fix(alerting): remove has no value condition
2016-08-22 12:20:07 +02:00