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

[8.x](backport #6485) [k8s] fix hints stream missing ids #6487

Merged
merged 1 commit into from
Jan 9, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 7, 2025

What does this PR do?

After this PR got merged our k8s CI test started failing. After investigating I realised that all the hint-based inputs are lacking streams IDs in the respective filestream inputs resulting in all of them registering with an empty ID and thus colliding. Also, during this investigation, I realised that by default when hints are enabled are capturing the logs of containers that do not feature a hints-related annotation. Thus I updated the Helm chart to explicitly disable the former when both the contailer logs of kubernetes integration and hints are enabled.

A fix should also happen in the actual job that fabricates and introduces these templates

Why is it important?

Because it fixes an actual bug and it brings the CI back to green

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have added an integration test or an E2E test

Disruptive User Impact

None

How to test this PR locally

mage integration:auth
PLATFORMS=linux/arm64 EXTERNAL=true SNAPSHOT=true PACKAGES=docker mage -v package 
INSTANCE_PROVISIONER=kind STACK_PROVISIONER=stateful K8S_VERSION=v1.31.1 SNAPSHOT=true mage integration:kubernetes

Related issues

N/A


This is an automatic backport of pull request #6485 done by [Mergify](https://mergify.com).

* fix: add required ids in hints input streams of type filestream

* feat: disable hints default_container_logs when kubernetes integration container logs is enabled

(cherry picked from commit 7ad0456)
@mergify mergify bot requested a review from a team as a code owner January 7, 2025 16:58
@mergify mergify bot added the backport label Jan 7, 2025
@mergify mergify bot requested review from pkoutsovasilis and michel-laterman and removed request for a team January 7, 2025 16:58
@swiatekm
Copy link
Contributor

swiatekm commented Jan 7, 2025

The beats change was breaking and will only go into 9.0.0, but I think we should fix this in all the maintained branches in agent anyway.

@pkoutsovasilis
Copy link
Contributor

pkoutsovasilis commented Jan 7, 2025

UPDATE: k8s step is passing

@swiatekm let's wait and see our CI here before merging this all the way through, I have tested it locally but let's see it succeeding also in our CI 🙂

Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@pkoutsovasilis pkoutsovasilis merged commit d711fda into 8.x Jan 9, 2025
10 checks passed
@pkoutsovasilis pkoutsovasilis deleted the mergify/bp/8.x/pr-6485 branch January 9, 2025 04:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants