36 Commits (a0932f4d2a493b2c1e608dbd7c9be125221b7eef)

Author	SHA1	Message	Date
Arve Knudsen	a5d9196a53	Chore/fix lint issues (#27704) ... * Chore: Fix linting issues Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	41d432b5ae	Chore: Enable whitespace linter (#25903) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Sofia Papagiannaki	5ae95190ed	Annotations: Change indices and rewrites annotation find query to improve database query performance (#21915) ... Drop indices and create new ones and rewrites annotation find query to address performance issues when querying annotation table and there is a large amount of rows. Fixes #21902 Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Kyle Brandt <kyle@kbrandt.com>	6 years ago
Ryan McKinley	6335509a23	Annotations: use a single row to represent a region (#17673) ... * SQLite migrations * cleanup * migrate end times * switch to update with a query * real migration * anno migrations * remove old docs * set isRegion from time changes * use <> for is not * add comment and fix index decleration * single validation place * add test * fix test * add upgrading docs * use AnnotationEvent * fix import * remove regionId from typescript	6 years ago
Thibault Chataigner	e06abb30aa	Alerting: Add tags to alert rules (#10989) ... Ref #6552	7 years ago
Marcus Efraimsson	f845a3b841	upgrade xorm packages to latest versions	7 years ago
Mario Trangoni	e85d0e8d6b	pkg/services/sqlstore: Fix sess.Id is deprecated: use ID instead. (megacheck) ... See, $ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep ID alert.go:193:15⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) alert.go:252:18⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) annotation.go:113:12⚠️ sess.Table("annotation").Id is deprecated: use ID instead (SA1019) (megacheck) org.go:136:24⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org.go:169:16⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:24:21⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:88:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:141:21⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) plugin_setting.go:103:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) preferences.go:97:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) quota.go:119:17⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) quota.go:221:17⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) team.go:77:24⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:243:16⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:267:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:282:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:313:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:475:3⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:479:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:493:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck)	7 years ago
Mario Trangoni	f73236f8f4	pkg/services/sqlstore: Fix x.Sql is deprecated: use SQL instead. (megacheck) ... See, $ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep SQL alert.go:43:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) alert_notification.go:122:12⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) annotation.go:226:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:228:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:302:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:416:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:635:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) migrations/user_mig.go:137:9⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) plugin_setting.go:29:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:41:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:84:13⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:143:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:186:13⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:234:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:172:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:199:17⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:223:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) temp_user.go:99:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) temp_user.go:124:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:375:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:377:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:379:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck)	7 years ago
bergquist	aed8208d78	renames PartialMatch to MatchAny	7 years ago
bergquist	1638c6bea1	enable partial tag matches for annotations	7 years ago
Torkel Ödegaard	132df4553c	fix: annnotation api & sql issue	8 years ago
Dan Cech	1dfff74da9	move database-specific code into dialects (#11884)	8 years ago
Karsten Weiss	de8696d5d3	Outdent code after if block that ends with return (golint) ... This commit fixes the following golint warnings: pkg/bus/bus.go:64:9: if block ends with a return statement, so drop this else and outdent its block pkg/bus/bus.go:84:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:137:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:177:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:183:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:199:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:208:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/components/dynmap/dynmap.go:236:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:242:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:257:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:263:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:278:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:284:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:299:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:331:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:350:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:356:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:366:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:390:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:396:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:405:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:427:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:433:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:442:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:459:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:465:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:474:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:491:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:497:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:506:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:523:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:529:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:538:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:555:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:561:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:570:12: if block ends with a return statement, so drop this else and outdent its block pkg/login/ldap.go:55:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/login/ldap_test.go:372:10: if block ends with a return statement, so drop this else and outdent its block pkg/middleware/middleware_test.go:213:12: if block ends with a return statement, so drop this else and outdent its block pkg/plugins/dashboard_importer.go:153:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/dashboards_updater.go:39:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/dashboards_updater.go:121:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/plugins.go:210:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/plugins.go:235:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/eval_context.go:111:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:92:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:98:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:122:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:108:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:118:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:121:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifiers/telegram.go:94:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/annotation.go:34:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/annotation.go:99:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/dashboard_test.go:107:13: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/plugin_setting.go:78:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/preferences.go:91:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/user.go:50:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/migrator/migrator.go:106:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/migrator/postgres_dialect.go:48:10: if block ends with a return statement, so drop this else and outdent its block pkg/tsdb/time_range.go:59:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/tsdb/time_range.go:67:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/tsdb/cloudwatch/metric_find_query.go:225:9: if block ends with a return statement, so drop this else and outdent its block pkg/util/filepath.go:68:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)	8 years ago
Karsten Weiss	be2d635078	Simplify error returns (gosimple) ... This fixes: pkg/api/avatar/avatar.go:261:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/log/file.go:102:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/metrics/graphitebridge/graphite.go:298:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/provisioning/provisioning.go:23:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/alert_notification.go:27:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/alert_notification.go:27:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/annotation.go:105:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/annotation.go:105:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard.go:351:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard.go:435:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard_acl.go:38:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard_acl.go:38:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/stats.go:22:2: 'if err != nil { return err }; return err' can be simplified to 'return err' (S1013) pkg/services/sqlstore/team.go:213:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:256:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:256:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:274:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:274:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:482:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:482:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)	8 years ago
flopp999	74f570fdf4	change annotation limit from 10 to 100	8 years ago
ryan	a0a6fa6fa5	remove constraint from sqlstore	8 years ago
ryan	0c7294593c	update the updated column!	8 years ago
ryan	20353db966	convert epoch to milliseconds	8 years ago
ryan	a2bbd89a9e	adding updated column	8 years ago
ryan	3898ea02e6	adding created column	8 years ago
Daniel Lee	3ae1bf0c16	dashfolders: permissions for saving annotations ... ref #10275 Use folder permissions instead of hard coded permissions on the annotations routes.	8 years ago
Torkel Ödegaard	0d12b37dfd	fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951	8 years ago
krise3k	45a572ebd8	annotations: quote reserved fields (#9550)	8 years ago
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	8 years ago
Torkel Ödegaard	359421b5e8	refactor: sqlstore inTransaction consolidated to one version, fixes #8376	9 years ago
Torkel Ödegaard	593b2ef866	annotation: added region support to annoations	9 years ago
Torkel Ödegaard	c9d7eb0a7a	feat(alerting): added clear history button to alert state history view, #6244	9 years ago
bergquist	e5c64732f1	fix(sql): Add boolstr to all dialects ... closes #6116	9 years ago
bergquist	d0f9623037	feat(alertlistpanel): support state filter ... ref #5981	9 years ago
Torkel Ödegaard	3af891d023	feat(alerting): restored alert history	9 years ago
Torkel Ödegaard	4a2f2fba73	feat(alerting): show panel specific alert annotations, #5694	9 years ago
Torkel Ödegaard	d60bd77658	feat(annotations): added support to show grafana stored annotations in graphs, #5982	9 years ago
bergquist	650a87dc05	feat(alerting): add alert history api endpoint ... ref #5850	9 years ago
Torkel Ödegaard	357358898d	feat(annotations): working on alert annotations, #5694	10 years ago