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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #11514: enable prometheus scraping #11536

Merged
merged 6 commits into from
May 20, 2021
Merged

Automated cherry pick of #11514: enable prometheus scraping #11536

merged 6 commits into from
May 20, 2021

Conversation

dntosas
Copy link
Contributor

@dntosas dntosas commented May 19, 2021

Cherry pick of #11514 on release-1.21.

#11514: enable prometheus scraping

For details on the cherry pick process, see the cherry pick requests page.

Christos Kotsis and others added 6 commits May 19, 2021 20:48
@tchatzig @dntosas
enable prometheus scraping
68c9b82 
When EnablePromethesMetrics is enabled the
required metrics endpoints are exposed but
no annotations is included in the agents.

This commit includes the prometheus.io/scrape
and prometheus.io/port annotations that
prometheus scrappers can use for auto-discovery

Co-authored-by: tchatzig <t.chatzigeorgiou@thebeat.co>
@ulfox @johngmyers @dntosas
Update upup/models/cloudup/resources/addons/networking.cilium.io/k8s-…
57b2b70 
…1.12-v1.8.yaml.template

Co-authored-by: John Gardiner Myers <jgmyers@proofpoint.com>
@ulfox @johngmyers @dntosas
Update upup/models/cloudup/resources/addons/networking.cilium.io/k8s-…
8e82ae0 
…1.12-v1.9.yaml.template

Co-authored-by: John Gardiner Myers <jgmyers@proofpoint.com>
@ulfox @johngmyers @dntosas
Update upup/models/cloudup/resources/addons/networking.cilium.io/k8s-…
3c32ee2 
…1.16-v1.10.yaml.template

Co-authored-by: John Gardiner Myers <jgmyers@proofpoint.com>
@dntosas
fix missing quote function with printf
985b094
@dntosas
1864ea6
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone May 19, 2021
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 19, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @dntosas. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 19, 2021
@johngmyers
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 19, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 20, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rifelpet

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 20, 2021
@k8s-ci-robot k8s-ci-robot merged commit 19457ed into kubernetes:release-1.21 May 20, 2021
@dntosas dntosas deleted the automated-cherry-pick-of-#11514-upstream-release-1.21 branch May 20, 2021 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rifelpet rifelpet rifelpet approved these changes

@KashifSaadat KashifSaadat Awaiting requested review from KashifSaadat

@olemarkus olemarkus Awaiting requested review from olemarkus

Assignees

@rifelpet rifelpet

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.
5 participants
@dntosas @k8s-ci-robot @johngmyers @rifelpet @ulfox