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 extraScrapeConfigs in prometheus-config-values.yaml #855

Merged
merged 5 commits into from
Jun 2, 2020
Merged

Add extraScrapeConfigs in prometheus-config-values.yaml #855

merged 5 commits into from
Jun 2, 2020

Conversation

jenting
Copy link

@jenting jenting commented May 28, 2020

Make sure it's tested

Technical writers will not always be able to verify the implementation!

Any PR opened is assumed to have been verified by QA if not designated by comments or labels otherwise. Please make sure you have tested the changes and included any information that a user would require to use the documentation.

Describe your changes

Add extraScrapeConfigs in prometheus-config-values.yaml

Related Issues / Projects

Please provide links to Bugzilla and other GitHub projects with your description if they are related to the changes.

fix #852

Enable maintainer updates

Please enable maintainer updates so we can push commits into your branch to make collaboration and reviews easier.

Do not force push your branch

Please avoid force pushing to branches that are subject of pull requests. Force pushing breaks maintainer commits in many cases and is very hard (if not impossible) to untangle for backporting.

Labels

Please set any (and all) appropriate labels that describe the status of the PR.

Label Description
P1 PR should be worked on and merged as soon as possible
Blocked Work can not proceed because other work has not been completed, PR can not be merged (code has not been merged but documentation is ready)
On-Hold Underlying work is completed but the PR should not be merged
ReleaseNotes User interaction is required after the introduction of this change and the change must be mentioned in the release notes
v3/v4/v4.x Which version of the release the PR should be merged into, this can be multiple versions, please set the "Backport" label if it needs to go into a previous release
Needs Review Some details of the PR are known to be incomplete and must be discussed with other engineers before merging (if possible assign reviewers or cc mention in comments), PR can not be merged

Signed-off-by: JenTing Hsiao <jenting.hsiao@suse.com>
@jenting jenting requested review from cclhsu and maximenoel8 May 28, 2020 13:00
@jenting jenting changed the base branch from master to maintenance/CaaS4 June 1, 2020 02:06
@jenting
Copy link
Author

jenting commented Jun 1, 2020

Merge remote branch maintenance/CaaS4 to fix conflicts.

@r0ckarong r0ckarong self-assigned this Jun 2, 2020
@r0ckarong r0ckarong added this to the Sprint 31 milestone Jun 2, 2020
@r0ckarong r0ckarong merged commit 731d91c into SUSE:maintenance/CaaS4 Jun 2, 2020
@jenting jenting deleted the issue-852 branch June 3, 2020 00:43
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.

[doc] 6.1.4.2 ETCD Cluster - also add scrape config to helm chart and do not use "edit"
2 participants