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

Geneva -send windows container inventory and perf with RS #1233

Merged
merged 5 commits into from
Apr 27, 2024

Conversation

jatakiajanvi12
Copy link
Contributor

This pull request primarily focuses on updates to the tomlparser-geneva-config.rb and main.sh scripts, with a minor change to the .trivyignore file. The changes in the scripts involve the introduction of a new @controllerType variable to differentiate between daemonset and replicaset configurations, and the addition of a new method populateGenevaIntegrationSettings to handle Geneva logs integration settings. The .trivyignore file has been updated to include a new CVE.

Updates to .trivyignore:

Updates to tomlparser-geneva-config.rb:

Updates to main.sh:

  • kubernetes/linux/main.sh: Modified the conditions for running fluent-bit-conf-customizer.rb and tomlparser-geneva-config.rb based on the GENEVA_LOGS_INTEGRATION_SERVICE_MODE environment variable. [1] [2]
  • kubernetes/linux/main.sh: Replaced GENEVA_LOGS_INTEGRATION with RS_GENEVA_LOGS_INTEGRATION in a condition for enabling Fluent Bit for Windows.

@jatakiajanvi12 jatakiajanvi12 requested a review from a team as a code owner April 19, 2024 16:57
@jatakiajanvi12 jatakiajanvi12 merged commit 3646eaf into ci_prod Apr 27, 2024
15 checks passed
jatakiajanvi12 added a commit that referenced this pull request May 7, 2024
* Update the geneva feature flag for RS

---------

Co-authored-by: Janvi Jatakia (from Dev Box) <jajataki@microsoft.com>
jatakiajanvi12 added a commit that referenced this pull request May 10, 2024
* fix version in Geneva config xml (#1227)

* fix bugs (#1230)

* fix bugs

* fix comment

* update dcr optimization error messages (#1228)

* update dcr optimization error messages

* add additional check for geneva

* redirect dcr parser stderr and stdout to traces file

---------

Co-authored-by: Amol Agrawal <amagraw@microsoft.com>

* update fluent-bit to 2.2.2 in linux (#1229)

* update fluent-bit to 2.2.2 in linux

---------

Co-authored-by: Amol Agrawal <amagraw@microsoft.com>

* update charts, yaml and release notes for 3.1.20 (#1234)

Co-authored-by: Amol Agrawal <amagraw@microsoft.com>

* Geneva -send windows container inventory and perf with RS (#1233)

* Update the geneva feature flag for RS

---------

Co-authored-by: Janvi Jatakia (from Dev Box) <jajataki@microsoft.com>

* Add scan tools to the build pipeline (#1237)

* Add the missing tools to the build pipeline

* update policheck similar to prom metrics

* update binskim

* update trivyignore

* add policheck in windows section

---------

Co-authored-by: Janvi Jatakia (from Dev Box) <jajataki@microsoft.com>

* streamline input plugin code. (#1238)

* streamline input plugin code

---------

Co-authored-by: Amol Agrawal <amagraw@microsoft.com>

* Telemetry optimization: adding addon token adapter traces as metrics (#1231)

* Add token adapter traces as metrics

* update trivyignore

* updating name of mdsd function

* Updating the addon token adapter to discard unnecessary logs

* Update trivyignore

---------

Co-authored-by: Janvi Jatakia (from Dev Box) <jajataki@microsoft.com>

* Update ai instrumentation key for USNAT/USSEC (#1239)

* update ai instrumentation key

* address comments

* resolve comments

* syntax error

---------

Co-authored-by: Janvi Jatakia (from Dev Box) <jajataki@microsoft.com>

* Gangams/logs 50k eps per node (#1235)

* mdsd version 50k changes

* amacore agent integration

* update liveness probe

* handle non-existent file

* refactor code

* fix bugs in mdsd install

* add poll to check amaca port up and running

* fix bug

* configure amaca configport

* try released mdsd version 1.30.3

* fix bug in logs and events profile

* test latest version of mdsd in GIG mode for both arm and x64

* try with build 50k eps changes

* update templates for high log scale mode

* remove libc.so copying

* revert logrotate conf for amaca log

* update mdsd version which has crash fix

* add proxy support for amacore agent

* update mdsd build with amaca gig la changes

* update mdsd build with gig la fixes

* update windows ama build

* mdsd version with 25k buffer size in mdsd

* update mdsd build

* add telemetry and configmap option

* fix bugs

* windows ama build with resource id bug fix

* update mdsd version with qos fixes

* update to use working templates

* add frequency to control amaca log

* mdsd build with qos updates

* trivy ignore update

* log amaca agent version

* improve comments

* add default fluent-bit config for high log scale

* add threding on tail plugin when high log scale enabled

* fix bugs

* fix bug

* fix bugs

* some improvements

* improve comments

* improve code

* update trivyignore

* fix bug

* update trivyignore

* pick GIGLA stream from config when highlogscale enabled

* fix bug

* template updates for high log scale mode

* fix bug

* clean up

* set envvar for ishighlogscale

* set envvar for ishighlogscale

* fix bug

* add log message to troubleshoot duplicate logs

* add log message to troubleshoot duplicate logs

* handle ama bug until fixed

* add storage total limit size

* rename for better reading

* fix pr feedback

* fix pr feedback

* fix pr feedback

* mdsd version update

* fix proxy bug

* fix proxy bug

* update trivy ignore

* clean up the code

* refactor code

* increase storage limit size to 2GB

* increase storage limit size to 10GB

* official mdsd and windows ama versions

* code cleanup

* code cleanup

* mdsd version annotation update

* fix pr feedback

* fix pr feedback

* fix pr feedback

* fix pr feedback

---------

Co-authored-by: Ganga Mahesh Siddem <gangams@microsoft.com>
Co-authored-by: Amol Agrawal <pfrcks@gmail.com>
Co-authored-by: Amol Agrawal <amagraw@microsoft.com>
Co-authored-by: Janvi Jatakia (from Dev Box) <jajataki@microsoft.com>
jatakiajanvi12 added a commit that referenced this pull request May 10, 2024
* Update the geneva feature flag for RS

---------

Co-authored-by: Janvi Jatakia (from Dev Box) <jajataki@microsoft.com>
jatakiajanvi12 added a commit that referenced this pull request May 10, 2024
jatakiajanvi12 added a commit that referenced this pull request May 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants