feat(controllers): add support for notification templates #1775

chenlujjj · 2024-11-26T15:47:09Z

related issue: #1736

theSuess · 2024-11-27T08:22:20Z

Thanks for the contribution! Can you use the common fields introduced in #1765? I'd also like to wait for #1770 to be merged just so we won't need to do this work again for notification templates as well

weisdd · 2024-11-27T09:09:07Z

I'm also in favour of having this PR rewritten on top of changes introduced in #1765 and #1770.

chenlujjj · 2024-11-27T09:27:06Z

Sure, I'll do that.

CarlosLanderas · 2024-11-29T11:13:24Z

Wow!!! This is awesome @chenlujjj!

We really need this and I was actually thinking about opening an issue to ask if I can contribute it myself.

Awesome thanks!

CarlosLanderas · 2024-12-09T14:22:17Z

Any ETA for this nice feature to be released?

Many thanks!

chenlujjj · 2024-12-10T05:06:29Z

Hi @CarlosLanderas ,I'm waiting for #1770 to be merged, so that I can rewrite this PR on top of it.

CarlosLanderas · 2024-12-12T08:47:30Z

Perfect @chenlujjj , thanks!

theSuess · 2024-12-16T10:05:22Z

@chenlujjj we just merged #1770 so if you have the time to rebase ontop of that, that'd be great!

Baarsgaard

Hi @chenlujjj looks good overall.
I spotted a few places in the Reconcile function where you're doing more than necessary.
Some of the code can be deleted or replaced with a couple of helper functions.

The other comments are mostly minor changes!

I wrote these diffs in the Github UI, there is likely an error in one or more of them

controllers/grafananotificationtemplate_controller.go

api/v1beta1/grafananotificationtemplate_types.go

controllers/grafananotificationtemplate_controller.go

Baarsgaard

@theSuess, @weisdd,
What do you think about this change where we can essentially remove the ResyncPeriodHasElapsed check?

controllers/grafananotificationtemplate_controller.go

chenlujjj · 2024-12-17T06:48:52Z

Thank you @Baarsgaard , I've updated the code based on your review suggestions and implementation of grafana folder controller.

Baarsgaard

Significantly less comments this time 😄 good work!

controllers/__debug_bin1929994336

controllers/grafananotificationtemplate_controller.go

chenlujjj · 2024-12-27T02:20:13Z

@Baarsgaard Could you please take another review, thank you.

Baarsgaard

Hi @chenlujjj sorry for the delay, here's another couple of comments 😅
Additionally, I'm very sorry for the PRs that I open that end up blocking yours 🙇‍♂️

api/v1beta1/grafananotificationtemplate_types.go

controllers/grafananotificationtemplate_controller.go

api/v1beta1/grafananotificationtemplate_types.go

controllers/grafananotificationtemplate_controller.go

Baarsgaard · 2024-12-30T15:45:49Z

@chenlujjj Both #1801 and #1804 were merged, you can now continue, and I will not be opening any more PRs that interfere with this!

chenlujjj · 2024-12-31T02:03:54Z

Thank you @Baarsgaard .
Hi @theSuess @weisdd Can anyone of you have a review ?

weisdd

Sorry for delays in reviews, during the holiday season many of maintainers are absent.

Overall, the code looks good to me, though we still need to make a few adjustments. Aside from the comments I've added, we also need to:

add an e2e-test for the resource;
add an example (check examples folder).

controllers/grafananotificationtemplate_controller.go

chore: pass linter

chenlujjj · 2025-01-05T13:30:01Z

Hi @weisdd I've added the e2e-test and example

CarlosLanderas · 2025-01-07T08:56:10Z

Thanks again for the effort @chenlujjj

weisdd

@chenlujjj I've pushed a commit to fix the example (typo in kind and missing instanceSelector). For the rest, it should be good to be merged. Thanks for the effort!

And thanks to @Baarsgaard for the help with reviews :)

chenlujjj · 2025-01-08T09:57:05Z

Thank you both! @weisdd @Baarsgaard

chenlujjj · 2025-01-09T14:00:35Z

Hi @weisdd Could you tell me about the plan time of the next release ?

weisdd · 2025-01-10T14:10:38Z

@theSuess any thoughts on when we should cut a release? :)

theSuess · 2025-01-13T10:42:07Z

@chenlujjj We'll aim for a release this Wednesday

chenlujjj requested review from NissesSenap, weisdd, ishanjainn, theSuess and pb82 as code owners November 26, 2024 15:47

chenlujjj force-pushed the feat/notificationtemplate branch 2 times, most recently from f604c8d to 0956145 Compare November 28, 2024 16:15

chenlujjj mentioned this pull request Dec 9, 2024

Chore(Internal): Add new shared reconciliation functions and migrate GrafanaFolder #1770

Merged

chenlujjj force-pushed the feat/notificationtemplate branch from 0956145 to d81aeae Compare December 16, 2024 10:38

chenlujjj requested a review from hubeadmin as a code owner December 16, 2024 10:38

chenlujjj force-pushed the feat/notificationtemplate branch from d81aeae to af84b6b Compare December 16, 2024 11:39

Baarsgaard suggested changes Dec 16, 2024

View reviewed changes

Baarsgaard reviewed Dec 16, 2024

View reviewed changes

controllers/grafananotificationtemplate_controller.go Outdated Show resolved Hide resolved

controllers/grafananotificationtemplate_controller.go Show resolved Hide resolved

controllers/grafananotificationtemplate_controller.go Outdated Show resolved Hide resolved

chenlujjj force-pushed the feat/notificationtemplate branch 4 times, most recently from c22bb96 to 87b78e6 Compare December 17, 2024 06:40

Baarsgaard suggested changes Dec 18, 2024

View reviewed changes

chenlujjj force-pushed the feat/notificationtemplate branch 3 times, most recently from 4d31b7c to e42ad78 Compare December 23, 2024 08:13

Baarsgaard suggested changes Dec 28, 2024

View reviewed changes

chenlujjj force-pushed the feat/notificationtemplate branch 2 times, most recently from be3b5ac to 6b001c4 Compare December 29, 2024 11:23

chenlujjj force-pushed the feat/notificationtemplate branch 3 times, most recently from 776792e to d2b665a Compare December 30, 2024 16:15

Baarsgaard approved these changes Dec 30, 2024

View reviewed changes

weisdd requested changes Dec 31, 2024

View reviewed changes

controllers/grafananotificationtemplate_controller.go Outdated Show resolved Hide resolved

controllers/grafananotificationtemplate_controller.go Show resolved Hide resolved

controllers/grafananotificationtemplate_controller.go Outdated Show resolved Hide resolved

chenlujjj force-pushed the feat/notificationtemplate branch 2 times, most recently from 6bb18fc to 508ca25 Compare January 5, 2025 12:51

feat: support notification template

58c26bd

chore: pass linter

chenlujjj force-pushed the feat/notificationtemplate branch from 508ca25 to 58c26bd Compare January 5, 2025 13:23

theSuess mentioned this pull request Jan 7, 2025

Request for Email Template Customization in Grafana Operator #1803

Closed

weisdd and others added 2 commits January 8, 2025 10:34

fix(examples): fix typos and add missing instance selector

475a1dc

Merge branch 'master' into feat/notificationtemplate

b409342

weisdd approved these changes Jan 8, 2025

View reviewed changes

weisdd added this pull request to the merge queue Jan 8, 2025

weisdd changed the title ~~feat: support notification template~~ feat(controllers): add support for notification templates Jan 8, 2025

Merged via the queue into grafana:master with commit fbc0b9e Jan 8, 2025
14 checks passed

theSuess added the feature this PR introduces a new feature label Jan 15, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(controllers): add support for notification templates #1775

feat(controllers): add support for notification templates #1775

chenlujjj commented Nov 26, 2024 •

edited by weisdd

Loading

theSuess commented Nov 27, 2024

weisdd commented Nov 27, 2024 •

edited

Loading

chenlujjj commented Nov 27, 2024

CarlosLanderas commented Nov 29, 2024

CarlosLanderas commented Dec 9, 2024

chenlujjj commented Dec 10, 2024

CarlosLanderas commented Dec 12, 2024

theSuess commented Dec 16, 2024

Baarsgaard left a comment •

edited

Loading

Baarsgaard left a comment •

edited

Loading

chenlujjj commented Dec 17, 2024

Baarsgaard left a comment

chenlujjj commented Dec 27, 2024

Baarsgaard left a comment

Baarsgaard commented Dec 30, 2024

chenlujjj commented Dec 31, 2024

weisdd left a comment

chenlujjj commented Jan 5, 2025

CarlosLanderas commented Jan 7, 2025

weisdd left a comment

chenlujjj commented Jan 8, 2025

chenlujjj commented Jan 9, 2025

weisdd commented Jan 10, 2025

theSuess commented Jan 13, 2025 •

edited

Loading

feat(controllers): add support for notification templates #1775

feat(controllers): add support for notification templates #1775

Conversation

chenlujjj commented Nov 26, 2024 • edited by weisdd Loading

theSuess commented Nov 27, 2024

weisdd commented Nov 27, 2024 • edited Loading

chenlujjj commented Nov 27, 2024

CarlosLanderas commented Nov 29, 2024

CarlosLanderas commented Dec 9, 2024

chenlujjj commented Dec 10, 2024

CarlosLanderas commented Dec 12, 2024

theSuess commented Dec 16, 2024

Baarsgaard left a comment • edited Loading

Choose a reason for hiding this comment

Baarsgaard left a comment • edited Loading

Choose a reason for hiding this comment

chenlujjj commented Dec 17, 2024

Baarsgaard left a comment

Choose a reason for hiding this comment

chenlujjj commented Dec 27, 2024

Baarsgaard left a comment

Choose a reason for hiding this comment

Baarsgaard commented Dec 30, 2024

chenlujjj commented Dec 31, 2024

weisdd left a comment

Choose a reason for hiding this comment

chenlujjj commented Jan 5, 2025

CarlosLanderas commented Jan 7, 2025

weisdd left a comment

Choose a reason for hiding this comment

chenlujjj commented Jan 8, 2025

chenlujjj commented Jan 9, 2025

weisdd commented Jan 10, 2025

theSuess commented Jan 13, 2025 • edited Loading

chenlujjj commented Nov 26, 2024 •

edited by weisdd

Loading

weisdd commented Nov 27, 2024 •

edited

Loading

Baarsgaard left a comment •

edited

Loading

Baarsgaard left a comment •

edited

Loading

theSuess commented Jan 13, 2025 •

edited

Loading