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

[O11y][Citrix ADC] Resolve the conflicts in host.ip field #7509

Merged
merged 5 commits into from
Sep 4, 2023

Conversation

milan-elastic
Copy link
Contributor

  • Bug

What does this PR do?

  • Added host.ip field in ecs.yml to avoid field conflicts for users.
  • Updated the condition in system datastream for ingest_pipeline.

Checklist

  • I have reviewed tips for building integrations and this pull request is aligned with them.
  • I have verified that all data streams collect metrics or logs.
  • I have added an entry to my package's changelog.yml file.

Related issues

@milan-elastic milan-elastic added Integration:Citrix-Netscaler bugfix Pull request that fixes a bug issue labels Aug 23, 2023
@milan-elastic milan-elastic self-assigned this Aug 23, 2023
@milan-elastic milan-elastic requested a review from a team as a code owner August 23, 2023 13:33
@elasticmachine
Copy link

elasticmachine commented Aug 23, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-09-04T10:31:14.525+0000

  • Duration: 16 min 23 sec

Test stats 🧪

Test Results
Failed 0
Passed 31
Skipped 0
Total 31

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@elasticmachine
Copy link

elasticmachine commented Aug 23, 2023

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 100.0% (5/5) 💚
Files 100.0% (5/5) 💚 3.659
Classes 100.0% (5/5) 💚 3.659
Methods 100.0% (48/48) 💚 8.333
Lines 97.782% (1102/1127) 👍 5.727
Conditionals 100.0% (0/0) 💚

Copy link
Contributor

@muthu-mps muthu-mps left a comment

Choose a reason for hiding this comment

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

Looks good!

packages/citrix_adc/_dev/build/docs/README.md Outdated Show resolved Hide resolved
ctx.citrix_adc.system.memory.size.value = convert(ctx.citrix_adc.system.memory.size.value);
}
if(ctx.citrix_adc?.system?.memory?.usage?.value!=null || ctx.citrix_adc?.system?.memory?.usage?.value!=""){
if(ctx.citrix_adc?.system?.memory?.usage?.value!=null && ctx.citrix_adc?.system?.memory?.usage?.value!=""){
Copy link
Contributor

Choose a reason for hiding this comment

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

These changes look to be unrelated ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ishleenk17 Logically this should be the && condition rather than the || condition. I have mentioned this change in description section of the PR.

Copy link
Contributor

@ishleenk17 ishleenk17 left a comment

Choose a reason for hiding this comment

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

Looks good!

@milan-elastic milan-elastic merged commit b037f8d into elastic:main Sep 4, 2023
@elasticmachine
Copy link

Package citrix_adc - 0.7.1 containing this change is available at https://epr.elastic.co/search?package=citrix_adc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Pull request that fixes a bug issue Integration:citrix_adc Citrix ADC
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[O11y][Citrix ADC] Conflicts in host.ip field
6 participants