feat: add structured metadata to the promtail push API - #14153
Merged
Conversation
Signed-off-by: Edward Welch <edward.welch@grafana.com>
owen-d
approved these changes
Sep 17, 2024
slim-bean
added a commit
that referenced
this pull request
Sep 17, 2024
Signed-off-by: Edward Welch <edward.welch@grafana.com> (cherry picked from commit 66cffcb)
loki-gh-app Bot
pushed a commit
that referenced
this pull request
Sep 17, 2024
Signed-off-by: Edward Welch <edward.welch@grafana.com> (cherry picked from commit 66cffcb)
7 tasks
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-14153-to-k218 origin/k218
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 66cffcb427bda28af6fbcfcf85a34771db3787bcWhen the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-14153-to-k218
# Create the PR body template
PR_BODY=$(gh pr view 14153 --json body --template 'Backport 66cffcb427bda28af6fbcfcf85a34771db3787bc from #14153{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore: [k218] feat: add structured metadata to the promtail push API' --body-file - --label 'size/S' --label 'product-approved' --label 'backport' --base k218 --milestone k218 --webOr, 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-14153-to-k218
# Create a pull request where the `base` branch is `k218` and the `compare`/`head` branch is `backport-14153-to-k218`.
# Remove the local backport branch
git switch main
git branch -D backport-14153-to-k218 |
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-14153-to-k218 origin/k218
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 66cffcb427bda28af6fbcfcf85a34771db3787bcWhen the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-14153-to-k218
# Create the PR body template
PR_BODY=$(gh pr view 14153 --json body --template 'Backport 66cffcb427bda28af6fbcfcf85a34771db3787bc from #14153{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore: [k218] feat: add structured metadata to the promtail push API' --body-file - --label 'size/S' --label 'product-approved' --label 'backport' --base k218 --milestone k218 --webOr, 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-14153-to-k218
# Create a pull request where the `base` branch is `k218` and the `compare`/`head` branch is `backport-14153-to-k218`.
# Remove the local backport branch
git switch main
git branch -D backport-14153-to-k218 |
slim-bean
added a commit
that referenced
this pull request
Sep 18, 2024
This was referenced Sep 18, 2024
This was referenced Oct 14, 2024
This was referenced Oct 21, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Loki added support for structured metadata in the push API some time ago, and Promtail was also updated to support this natively, however it was missed to add support for propagating structured metadata when using the push API in promtail, this PR addresses this.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PRdeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR