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

chore(kuma-cp) prometheus overrides on Kubernetes #808

Merged
merged 1 commit into from
Jun 3, 2020

Conversation

jakubdyszkiewicz
Copy link
Contributor

Summary

Some time ago overrides for port and path was done using prometheus.io annotations (Kuma prometheus annotations were converted to prometheus) because Kuma DP discovery was based on prometheus.io annotations. Later we changed this so discovery of Kuma DP is based on kuma-prometheus-sd and we leave prometheus.io annotations for apps.

In the process of this change, we lost the ability to override port and path of Kuma DP metrics on Pod. This PR restores this functionality, so we convert Kuma Metrics annotations to DP config.

Documentation

Already there

@jakubdyszkiewicz jakubdyszkiewicz requested a review from a team June 3, 2020 10:10
pod: "07.pod.yaml",
servicesForPod: "07.services-for-pod.yaml",
dataplane: "07.dataplane.yaml",
}),
Copy link
Contributor

Choose a reason for hiding this comment

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

So this is the actual test to verify that we can't break the feature next time?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes

Copy link
Contributor

@nickolaev nickolaev left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@jakubdyszkiewicz jakubdyszkiewicz merged commit 990fc9b into master Jun 3, 2020
@jakubdyszkiewicz jakubdyszkiewicz deleted the chore/prometheus-override-k8s branch June 3, 2020 12:16
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