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

feat(metrics): add additionalServiceMonitors option #3292

Merged
merged 1 commit into from
Sep 21, 2023

Conversation

swiatekm
Copy link

Add sumologic.metrics.additionalServiceMonitors, which works the same way as the respective kube-prometheus-stack option, but without depending on Prometheus to be enabled.

Checklist

  • Changelog updated or skip changelog label added
  • Documentation updated
  • Template tests added for new features

@swiatekm swiatekm requested a review from a team as a code owner September 21, 2023 13:55
@github-actions github-actions bot added the documentation documentation label Sep 21, 2023
@swiatekm
Copy link
Author

swiatekm commented Sep 21, 2023

This isn't a breaking change, and I'd like to merge it to v3 as well to make migration easier for users. I'll put up a separate PR for the v4 migration doc.

@swiatekm swiatekm merged commit 2051602 into main Sep 21, 2023
36 checks passed
@swiatekm swiatekm deleted the feat/metrics/additional-servicemonitors branch September 21, 2023 14:45
@sumo-backporter
Copy link
Contributor

The backport to release-v3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-v3 release-v3
# Navigate to the new working tree
cd .worktrees/backport-release-v3
# Create a new branch
git switch --create backport-3292-to-release-v3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 20516028f183ce1fe260a34e7f07835aceea64fb
# Push it to GitHub
git push --set-upstream origin backport-3292-to-release-v3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-v3

Then, create a pull request where the base branch is release-v3 and the compare/head branch is backport-3292-to-release-v3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants