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

Add alerting options for datasources #701

Merged
merged 5 commits into from
Apr 10, 2022

Conversation

annymsMthd
Copy link
Contributor

Signed-off-by: Joshua Benjamin joshua.benjamin@iherb.com

Description

Add datasource json options for alertmanager settings

Relevant issues/tickets

n/a

Type of change

Update of datasource.jsondata

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist

  • This change requires a documentation update
  • I have added tests that prove my fix is effective or that my feature works
  • I have added a test case that will be used to verify my changes
  • Verified independently on a cluster by reviewer

Verification steps

n/a

@annymsMthd
Copy link
Contributor Author

Not sure if I'm missing anything to add these options

@annymsMthd
Copy link
Contributor Author

Made updates that the build failures pointed out.

@annymsMthd
Copy link
Contributor Author

api.md changed a lot when I ran make api-docs

@NissesSenap
Copy link
Collaborator

@annymsMthd please run make test and check in the changes and it hopefully should be okay

annymsMthd and others added 3 commits April 5, 2022 12:22
Signed-off-by: Joshua Benjamin <joshua.benjamin@iherb.com>
@david-martin
Copy link
Contributor

@annymsMthd
I've force pushed a rebase & ran make api-docs & make test to update some generated files.
Let's see if the build passes.

@annymsMthd
Copy link
Contributor Author

Thanks. Yeah I've done that a few times. Looks like test is failing now because creationTimestamp in the crd manifests.. odd

@NissesSenap
Copy link
Collaborator

NissesSenap commented Apr 10, 2022

No it's because you don't check in all the changes that you have made. I have fixed it now and I will merge it.
Thanks for your contribution.

@NissesSenap NissesSenap merged commit 52798c4 into grafana:master Apr 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants