-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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: add structured metadata to the promtail push API #14153
Conversation
Signed-off-by: Edward Welch <edward.welch@grafana.com>
Signed-off-by: Edward Welch <edward.welch@grafana.com> (cherry picked from commit 66cffcb)
Signed-off-by: Edward Welch <edward.welch@grafana.com> (cherry picked from commit 66cffcb)
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 66cffcb427bda28af6fbcfcf85a34771db3787bc When 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 --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-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 |
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 66cffcb427bda28af6fbcfcf85a34771db3787bc When 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 --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-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 |
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.md
guide (required)feat
PRs 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.md
production/helm/loki/Chart.yaml
and updateproduction/helm/loki/CHANGELOG.md
andproduction/helm/loki/README.md
. Example PRdeprecated-config.yaml
anddeleted-config.yaml
files respectively in thetools/deprecated-config-checker
directory. Example PR