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

Documentation: set up network metrics for Asserts #1007

Merged
merged 6 commits into from
Jul 15, 2024

Conversation

grafsean
Copy link
Contributor

@grafsean grafsean commented Jul 11, 2024

Adds documentation to set up Asserts network.

image

docs/sources/network/asserts.md Outdated Show resolved Hide resolved
docs/sources/network/asserts.md Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Jul 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.16%. Comparing base (0c7d38f) to head (fa8025a).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1007      +/-   ##
==========================================
- Coverage   80.17%   80.16%   -0.01%     
==========================================
  Files         137      137              
  Lines       10930    10930              
==========================================
- Hits         8763     8762       -1     
- Misses       1685     1686       +1     
  Partials      482      482              
Flag Coverage Δ
integration-test 55.03% <ø> (-0.12%) ⬇️
k8s-integration-test 57.60% <ø> (-0.12%) ⬇️
oats-test 37.31% <ø> (ø)
unittests 50.04% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@grcevski
Copy link
Contributor

The test failures need a merge with main, the new jaeger release yesterday is causing us to fail to push traces.

Copy link
Contributor

@mariomac mariomac left a comment

Choose a reason for hiding this comment

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

Great job!

I have a minor correction, but I'll let @gouthamve to give the final approval.

docs/sources/network/asserts.md Outdated Show resolved Hide resolved
Copy link
Member

@gouthamve gouthamve left a comment

Choose a reason for hiding this comment

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

Minor nit. But LGTM!

Lets :shipit:

Comment on lines 23 to 24
1. An application to auto-instrument with Beyla.
1. A Linux environment that supports eBPF kernel modules.
Copy link
Member

Choose a reason for hiding this comment

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

I'd say these are optional tbh.

@grafsean grafsean merged commit c5730ef into main Jul 15, 2024
8 checks passed
@grafsean grafsean deleted the grafsean/asserts-network-1 branch July 15, 2024 12:34
@grafsean
Copy link
Contributor Author

@mariomac I forgot to tag for backports, what's the process again to manually port the change to latest?

@grafsean grafsean added documentation Improvements or additions to documentation type/docs labels Jul 16, 2024
@grafsean grafsean changed the title Documentation to set up Asserts network Documentation: set up Asserts network Jul 16, 2024
@grafsean grafsean changed the title Documentation: set up Asserts network Documentation: set up network metrics for Asserts Jul 16, 2024
github-actions bot pushed a commit that referenced this pull request Jul 17, 2024
Co-authored-by: Mario Macias <mario.macias@grafana.com>
Co-authored-by: Goutham Veeramachaneni <goutham@grafana.com>
(cherry picked from commit c5730ef)
github-actions bot pushed a commit that referenced this pull request Jul 17, 2024
Co-authored-by: Mario Macias <mario.macias@grafana.com>
Co-authored-by: Goutham Veeramachaneni <goutham@grafana.com>
(cherry picked from commit c5730ef)
Copy link
Contributor

The backport to release-1.4 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 branch
git switch --create backport-1007-to-release-1.4 origin/release-1.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x c5730ef6f72e2c4c6adaba538b9b162bd92eb516

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-1007-to-release-1.4
# Create the PR body template
PR_BODY=$(gh pr view 1007 --json body --template 'Backport c5730ef6f72e2c4c6adaba538b9b162bd92eb516 from #1007{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-1.4] Documentation: set up network metrics for Asserts' --body-file - --label 'documentation' --label 'type/docs' --label 'backport' --base release-1.4 --milestone release-1.4 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-1007-to-release-1.4

# Create a pull request where the `base` branch is `release-1.4` and the `compare`/`head` branch is `backport-1007-to-release-1.4`.

# Remove the local backport branch
git switch main
git branch -D backport-1007-to-release-1.4

grafsean added a commit that referenced this pull request Jul 17, 2024
Co-authored-by: Mario Macias <mario.macias@grafana.com>
Co-authored-by: Goutham Veeramachaneni <goutham@grafana.com>
(cherry picked from commit c5730ef)

Co-authored-by: Sean Packham <sean.packham@grafana.com>
grafsean added a commit that referenced this pull request Jul 17, 2024
Co-authored-by: Mario Macias <mario.macias@grafana.com>
Co-authored-by: Goutham Veeramachaneni <goutham@grafana.com>
(cherry picked from commit c5730ef)

Co-authored-by: Sean Packham <sean.packham@grafana.com>
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.

5 participants