Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alertmanager test branch #192

Closed
wants to merge 55 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
98d6695
Add alertmanager config handling
TheoBrigitte Dec 5, 2024
b575507
make the alertmanagerURL simpler
TheoBrigitte Dec 5, 2024
f281c75
make the build green
TheoBrigitte Dec 5, 2024
b58a751
I said green
TheoBrigitte Dec 5, 2024
bc2aef8
go mod tidy
TheoBrigitte Dec 5, 2024
8beb36c
Merge remote-tracking branch 'origin/main' into alertmanager-config
TheoBrigitte Dec 9, 2024
a6b2ccc
Add some stuff
TheoBrigitte Dec 9, 2024
5b47de7
Merge remote-tracking branch 'origin/main' into alertmanager-config
TheoBrigitte Dec 9, 2024
5e41fc5
Add alertmanager.Configure
TheoBrigitte Dec 9, 2024
707b23a
setup logger before loading env vars
TheoBrigitte Dec 10, 2024
3776e72
Retrive all templates by suffix
TheoBrigitte Dec 10, 2024
3e6e2f9
Fix maps > slices.Collect
TheoBrigitte Dec 10, 2024
d8a3026
Fix test
TheoBrigitte Dec 10, 2024
b160659
Remove test
TheoBrigitte Dec 10, 2024
b32a6de
go mod tidy
TheoBrigitte Dec 10, 2024
2023dc7
fix linting errors
TheoBrigitte Dec 10, 2024
dfec94d
Add alertmanager helm helpers
TheoBrigitte Dec 10, 2024
4e89889
Wire Alertmanager into GrafanaOrganization controller
TheoBrigitte Dec 10, 2024
dd4872a
Merge remote-tracking branch 'origin/main' into alertmanager-config
TheoBrigitte Dec 10, 2024
cebac34
Set the client
TheoBrigitte Dec 10, 2024
171b62a
Add Alertmanager config and templates in Helm chart
TheoBrigitte Dec 10, 2024
9eea3f8
use .helm-template instead of .tpl
TheoBrigitte Dec 10, 2024
27b62fa
re-use existing values
TheoBrigitte Dec 10, 2024
49b5a1a
normalize values names
TheoBrigitte Dec 10, 2024
2ea1101
try to make helm happy: error calling tpl: cannot retrieve Template.B…
TheoBrigitte Dec 10, 2024
801cadd
helm 3.10.3 I hate you deeply
TheoBrigitte Dec 10, 2024
8cbdbfb
Release v0.10.0 (#191)
taylorbot Dec 10, 2024
5d320b9
quote the tmp_string
TheoBrigitte Dec 10, 2024
8a79cf5
Add values and alertmanagerURL
TheoBrigitte Dec 10, 2024
4cfbb20
Add alertmanagerURL
TheoBrigitte Dec 10, 2024
3c450c7
debug log
TheoBrigitte Dec 10, 2024
c522b81
fix debug log
TheoBrigitte Dec 10, 2024
388a639
Fix invalid request body
TheoBrigitte Dec 10, 2024
a366895
Handle non 201 errors
TheoBrigitte Dec 10, 2024
377edef
Merge remote-tracking branch 'origin/main' into alertmanager-config
TheoBrigitte Dec 10, 2024
492a1d7
Merge remote-tracking branch 'origin/main' into alertmanager-config-helm
TheoBrigitte Dec 13, 2024
9591a92
rename alertmanager to alerting in values.yaml
TheoBrigitte Dec 13, 2024
c715315
Merge remote-tracking branch 'origin/main' into alertmanager-config
TheoBrigitte Dec 13, 2024
e58c682
remove alertmanager job from grafana organization controller
TheoBrigitte Dec 15, 2024
740d3b9
Add Alertmanager controller
TheoBrigitte Dec 15, 2024
cc9987d
revert grafana organization controller changes
TheoBrigitte Dec 15, 2024
b3f9a8e
Merge remote-tracking branch 'origin/alertmanager-config-helm' into a…
TheoBrigitte Dec 15, 2024
18935b1
update alertmanager > alerting in deployment.yaml
TheoBrigitte Dec 15, 2024
7d75b09
Merge branch 'alertmanager-config' into alertmanager-controller
TheoBrigitte Dec 15, 2024
fbda645
revert grafana organization controller changes
TheoBrigitte Dec 15, 2024
b0eb4dc
pass secret to Configure, add comment
TheoBrigitte Dec 15, 2024
ee02be2
Merge branch 'alertmanager-config' into alertmanager-controller
TheoBrigitte Dec 15, 2024
6fbcf61
update alertmanager job
TheoBrigitte Dec 15, 2024
8cda08b
get base template name
TheoBrigitte Dec 15, 2024
01ce0f3
remove uneeded flags
TheoBrigitte Dec 15, 2024
a80d94d
Merge branch 'alertmanager-config' into alertmanager-controller
TheoBrigitte Dec 15, 2024
a666060
restore flags
TheoBrigitte Dec 15, 2024
5b639a1
Revert "Merge remote-tracking branch 'origin/alertmanager-config-helm…
TheoBrigitte Dec 15, 2024
a91e537
rename alertmanager to alerting in values.yaml
TheoBrigitte Dec 15, 2024
a9a6092
Merge branch 'alertmanager-config' into alertmanager-controller
TheoBrigitte Dec 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into alertmanager-config
  • Loading branch information
TheoBrigitte committed Dec 9, 2024
commit 8beb36cb0306123987dd4d04f824bcf84590b6f9

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.