Skip to content

Add ServiceMonitor to Helm Chart #2831

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

Merged
merged 9 commits into from
Jul 25, 2022

Conversation

araineUnity
Copy link
Contributor

Proposed changes

This PR addresses issue 2830, adding the ServiceMonitor template to the basic helm-chart for kubernetes-ingress. This would by default be inactive, only enabled if controller.serviceMonitor.create is set.

Checklist

  • [ X ] I have read the CONTRIBUTING doc
  • [ X ] I have added tests that prove my fix is effective or that my feature works
  • [ X ] I have checked that all unit tests pass after adding my changes
  • [ X ] I have updated necessary documentation
  • [ X ] I have rebased my branch onto main
  • [ X ] I will ensure my PR is targeting the main branch and pulling from my branch from my own fork

commit 3765c38
Merge: 8da9a9c 84cf0d2
Author: araineUnity <77511580+araineUnity@users.noreply.github.com>
Date:   Thu Jul 7 14:40:49 2022 -0400

    Merge branch 'add-servicemonitor' of ssh://github.com/araineUnity/kubernetes-ingress into add-servicemonitor

commit 8da9a9c
Merge: d743ea0 8ec6e2f
Author: araineUnity <77511580+araineUnity@users.noreply.github.com>
Date:   Thu Jul 7 14:40:45 2022 -0400

    Merge branch 'main' into add-servicemonitor

commit 84cf0d2
Merge: d743ea0 8ec6e2f
Author: araineUnity <77511580+araineUnity@users.noreply.github.com>
Date:   Thu Jul 7 14:40:18 2022 -0400

    Merge branch 'nginxinc:main' into add-servicemonitor

commit d743ea0
Author: araineUnity <77511580+araineUnity@users.noreply.github.com>
Date:   Thu Jul 7 14:39:06 2022 -0400

    Added create flag for controller.serviceMonitor.

commit 4b8f8fd
Author: araineUnity <77511580+araineUnity@users.noreply.github.com>
Date:   Thu Jul 7 14:35:45 2022 -0400

    Added create flag wrapping for the template.

commit 02c5690
Author: araineUnity <77511580+araineUnity@users.noreply.github.com>
Date:   Wed Jun 1 16:08:08 2022 -0400

    Add descriptions of new values for ServiceMonitor in the documentation. Clarify naming of matchLabels value.

commit 1844f1f
Author: araineUnity <77511580+araineUnity@users.noreply.github.com>
Date:   Wed Jun 1 15:51:37 2022 -0400

    Add service monitor definition to the Helm charts for deployment.
@codecov-commenter
Copy link

codecov-commenter commented Jul 7, 2022

Codecov Report

Merging #2831 (1c0318f) into main (37b0866) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #2831   +/-   ##
=======================================
  Coverage   53.02%   53.02%           
=======================================
  Files          58       58           
  Lines       15641    15641           
=======================================
  Hits         8294     8294           
  Misses       7068     7068           
  Partials      279      279           

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@brianehlert brianehlert linked an issue Jul 8, 2022 that may be closed by this pull request
@lucacome lucacome changed the title Squashed commit of the following: Add ServiceMonitor to Helm Chart Jul 11, 2022
@lucacome lucacome added this to the v2.4.0 milestone Jul 11, 2022
@lucacome lucacome requested review from a team, lucacome, ciarams87 and shaun-nx July 13, 2022 22:16
@lucacome lucacome added the enhancement Pull requests for new features/feature enhancements label Jul 13, 2022
@lucacome lucacome self-assigned this Jul 13, 2022
@unitygilles
Copy link

@ciarams87 is this something you'd please be able to review and approve so it gets merged into main?

@araineUnity
Copy link
Contributor Author

@ciarams87 is this something you'd please be able to review and approve so it gets merged into main?

@ciarams87 or @shaun-nx , any feedback on this, or if possible, an approval? :) Thanks!

@lucacome
Copy link

@araineUnity @unitygilles sorry for the delay, merging now.

@lucacome lucacome merged commit 8077de9 into nginx:main Jul 25, 2022
@centromere
Copy link
Contributor

@araineUnity I think the default value for endpoints should be [], not {}.

Error: UPGRADE FAILED: error validating "": error validating data: ValidationError(ServiceMonitor.spec.endpoints): invalid type for com.coreos.monitoring.v1.ServiceMonitor.spec.endpoints: got "map", expected "array"

(cc @lucacome)

@lucacome
Copy link

lucacome commented Oct 4, 2022

thanks for catching this @centromere I added the change to #3113

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Pull requests for new features/feature enhancements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Service Monitor addition to the Helm Deployment Chart Support for Prometheus Operator ServiceMonitor
6 participants