Skip to content

add metrics label for service monitor discovery#765

Merged
alexmt merged 1 commit intoargoproj:masterfrom
conorfennell:master
Nov 14, 2018
Merged

add metrics label for service monitor discovery#765
alexmt merged 1 commit intoargoproj:masterfrom
conorfennell:master

Conversation

@conorfennell
Copy link
Contributor

ServiceMonitor, the Prometheus operator's custom resource definition discovers Service's by label.

Currently the metrics service yaml defintions do not have any label, this pull request adds one so the Service can be use to be discovered by the Prometheus operator.

@codecov-io
Copy link

codecov-io commented Nov 13, 2018

Codecov Report

Merging #765 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #765   +/-   ##
=======================================
  Coverage   26.51%   26.51%           
=======================================
  Files          41       41           
  Lines        6340     6340           
=======================================
  Hits         1681     1681           
  Misses       4426     4426           
  Partials      233      233

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f4387d5...c1f61b5. Read the comment docs.

@alexmt alexmt self-requested a review November 13, 2018 16:47
Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for contribution @conorfennell !

Please add app label to manifests/namespace-install.yaml as well. Both manifests/install.yaml and manifests/namespace-install.yaml are auto-generated. You can run ./hack/update-manifests.sh to update them.

@conorfennell
Copy link
Contributor Author

@alexmt Done

Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@alexmt alexmt merged commit 7552a36 into argoproj:master Nov 14, 2018
leoluz pushed a commit to leoluz/argo-cd that referenced this pull request Sep 23, 2025
…uster scoped resources (argoproj#765)

* Using live obj to get the resource key if not nil

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Fixed failing unit tests

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Added test case for validating cluster scoped resources with ApplyOutOfSyncOnly=true

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Fixed gofumpt formatting errors

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Corrected unit tests for cluster scoped resources

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Removed unwanted code comments

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Added comments for explaining the reason why ns is set from live object

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Added comments in the unit test

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

---------

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>
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.

3 participants