-
Notifications
You must be signed in to change notification settings - Fork 5k
test4 #44958
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
Closed
Closed
test4 #44958
Conversation
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
…lastic#43162) (cherry picked from commit 59ca27d) Co-authored-by: Dan Kortschak <[email protected]>
…lastic#43199) By default, beats require the config files to be writable only by the file owner, so tests reading config files committed do the repo might fail depending on how the host system is configured. For those tests the permission check is relaxed. For those tests a the `testflag` package introduces a helper function ,`MustSetStrictPermsFalse`, to set `strict.perms` flag to false, preventing the beats to perform the check for strict permissions on config files. It also fixes the test framework and python tests which were saving the config files with broader permissions than required by the beats by default. (cherry picked from commit ced0b0c) Co-authored-by: Anderson Queiroz <[email protected]>
Enable FIPS compliant builds when the env var FIPS=true is set. Artifacts are built with the microsfot/go toolchain with the env var GOEXPERIMENT=systemcrypto and the build tag "-tags=requirefips". In order to run the resulting binary, the system must have a FIPS compliant crypto provider. (cherry picked from commit 83e0ec0) Co-authored-by: Michel Laterman <[email protected]>
* create FIPSConfig loaded from yaml file and filter beats * Refactor FIPS-compliant main * fixup! Refactor FIPS-compliant main * Log what beats are being packaged within agentbeat * fix go.mod * Add placeholders in fips settings yaml * make notice * Skip metricbeat integration tests for agentbeat * Fix linter false positive * Add details about skipping metribeat integration tests * Clarify comment about filtering beats included in agentbeat (cherry picked from commit 2dbb137) Co-authored-by: Paolo Chilà <[email protected]>
gotestcover has been archived and is no longer maintained the readme recommends replacing the tool with xargs+tail drop the dependency and update the makefile accordingly (cherry picked from commit b8d6142) Co-authored-by: kruskall <[email protected]>
…lastic#43291) * fix metricbeat/module/apache/status TestFetchTimeout relax test assertion for metricbeat/module/apache/status TestFetchTimeout to also include "context deadline exceeded". The current way we do HTTP request might fail with either error, the original "Client.Timeout exceeded" but also with only "context deadline exceeded" (cherry picked from commit 61c8f85) Co-authored-by: Anderson Queiroz <[email protected]>
…lastic#43301) replace x/crypto with stdlib packages Signed-off-by: kruskal <[email protected]> (cherry picked from commit eb117bd) Co-authored-by: kruskall <[email protected]>
…3062) (elastic#43203) * feat(fips): do not allow scram sasl mechanism in fips mode scram is using custom implementation of pbkdf2 which is not allowed in fips mode * Update sasl_fips.go * Update sasl_fips.go (cherry picked from commit 9761c36) Co-authored-by: kruskall <[email protected]>
…al monitoring (elastic#43229) * [feat][fbreceiver] - enable http internal monitoring (elastic#42886) * feat: enable http intenral monitoring * enable metricreport * review comments * chore: review comments, final per namespace registry * restore log * notice * add test cases * public the lookup func (cherry picked from commit da4c930) # Conflicts: # go.mod # go.sum * go.mod * notice --------- Co-authored-by: Vihas Makwana <[email protected]> Co-authored-by: Vihas Makwana <[email protected]>
…lastic#43260) (cherry picked from commit cd2ff13) Co-authored-by: Fae Charlton <[email protected]>
…or (elastic#43302) (elastic#43319) * oteltest: make CheckReceivers environment more similar to the collector The CheckReceivers function is designed to start receivers in the same process to assert conditions. This simulated environment should closely resemble the real OTel collector startup. This PR fixes some inconsistencies in the test environment. First, when instantiating receivers, the collector first creates them using the factory and only then starts each component. Previously, we were creating and starting each receiver sequentially, which is incorrect and masked issues with global state when multiple receivers were present. Second, a Beats receiver logger inherits from the zap.Core of the collector logger. This core includes certain fields—specifically data_type, kind, and name. In the tests, these fields were previously missing, so this PR ensures they are included. * remove i++ * use EventuallyWithT for assertions * fix imports * specify factory per receiver (cherry picked from commit 8d31036) Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
* refactor: use go.mod mage version do not overwrite mage version in makefile and use go.mod as the source of truth * Update mage-install.mk * Update mage-install.mk (cherry picked from commit 13f7cab) Co-authored-by: kruskall <[email protected]>
…lastic#43338) Skip the flaky test in elastic#43253 (cherry picked from commit 61ec8ab) Co-authored-by: Fae Charlton <[email protected]>
Disable `metricbeat/module/system/process TestFetchDegradeOnPartial` reported in elastic#42809. Also change the failing `t.Assert` to `t.Require` so that when it does fail, it doesn't fall through to a panic on the next line by accessing the first element of an empty array. (cherry picked from commit 0b2e66a) Co-authored-by: Fae Charlton <[email protected]>
) (elastic#43340) (cherry picked from commit d68410a) Co-authored-by: kruskall <[email protected]>
…ic#42582) (elastic#43353) * feat(fips): disable usage of flowhash/communityid in fips mode In version 1 of the ID, the hash algorithm is SHA1 usage of flowhash fails with the following message when the stdlib is in fips only mode: crypto/sha1: use of SHA-1 is not allowed in FIPS 140-only mode * test: skip communityid tests in fips mode * test: skip communityid tests in fips mode * fix: resolve compile errors * lint: fix linter issues * refactor: add fips noop community implementation * lint: fix linter issues (cherry picked from commit 3b00fcb) Co-authored-by: kruskall <[email protected]>
) (cherry picked from commit 3758912) Co-authored-by: Mirko Bez <[email protected]>
…43332) The `libbeat/common/op` package has logic errors, and no remaining callers. (cherry picked from commit 97f372b) Co-authored-by: Fae Charlton <[email protected]>
…in connection receive (elastic#42222) (elastic#43361) --------- Co-authored-by: Tiago Queiroz <[email protected]> (cherry picked from commit 19a724d) Co-authored-by: Joseph Heyburn <[email protected]>
…#43063) (elastic#43365) This centralises the state store to simplify and clarify the use of persistent stores. (cherry picked from commit df62e10) Co-authored-by: Dan Kortschak <[email protected]>
) (elastic#43245) (cherry picked from commit c80fbe1) Co-authored-by: Victor Martinez <[email protected]>
…43374) There's an older faccessat(2) that is used by older glibc, particularly the one in ubuntu 20.04. Any cgo program (like any processor using quark) might end up needing that. (cherry picked from commit 73353a8) Co-authored-by: Christiano Haesbaert <[email protected]>
…te vSphere connection is configured as insecure (elastic#43325) * feat: add warning log message to indicate vSphere connection is configured as insecure (elastic#43104) * feat: add warning log message to indicate vSphere connection is configured as insecure * chore: add CHANGELOG.asciidoc entry * move changelog entry from CHANGELOG.asciidoc to CHANGELOG.next.asciidoc * add missing license header * fix linter issue * fix changelog entry section * Update metricbeat/module/vsphere/security/logging.go Co-authored-by: Ishleen Kaur <[email protected]> --------- Co-authored-by: Ishleen Kaur <[email protected]> (cherry picked from commit 4c7d45c) * fix: remove incorect CHANGELOG.next.asciidoc entries --------- Co-authored-by: stefans-elastic <[email protected]>
…lastic#43410) * feat: move js processor registry to separate package a lot processors register a js processor. This is importing the javascript processor which is causing goja and a few other dependencies to be pulled in. For downstream users of libbeat and few beats that do not use the javascript processor this is a non-trivial maintenance burden, especially because they will have to add and maintain a replace directive to ensure the binary builds. Move jsprocessor registry to a separate package so goja and the javascript processor are only imported when used, making them self contained. * Update chain.go * Update processor_test.go * lint: fix compile errors (cherry picked from commit 0710350) Co-authored-by: kruskall <[email protected]>
… binaries (elastic#42719) * feat: drop init.d support and go-daemon binaries (elastic#41845) * feat: drop init.d support and go-daemon binaries remove init.d scripts drop go-daemon dep and daemon binaries cleanup mage tasks * lint: fix linter issues * docs: remove reference to init.d scripts (cherry picked from commit 5fbf359) * fix: update functionbeat magefile --------- Co-authored-by: kruskall <[email protected]> Co-authored-by: Andrew Kroh <[email protected]>
…lastic#43433) * fix: resolve communityid compile errors in fips mode * Update communityid_fips.go (cherry picked from commit 3479a2f) Co-authored-by: kruskall <[email protected]>
Fix flaky timeout tests. These tests confirmed that their timeouts worked by scanning the error text returned from the http request. The error text that they expected was: `error in http fetch: error making http request: Get "http://127.0.0.1:57060/stats": context deadline exceeded (Client.Timeout exceeded while awaiting headers)` However there are two other semi-common forms: `error in http fetch: error making http request: Get "http://127.0.0.1:57052/stats": context deadline exceeded` `error in http fetch: error making http request: Get "http://127.0.0.1:32839/stats": net/http: request canceled (Client.Timeout exceeded while awaiting headers)` This result is still a successful check of the timeout feature, even though the propagated error string varies slightly. I've switched to checking substrings that are stable between all error strings. I also reverted some of the changes in elastic#43283 that were unrelated to the test flakiness, and that made the test potentially less stable. These tests previously had near-identical code -- the original version used a channel to terminate the server response deterministically when the test was over, but elastic#43283 changed this to a fixed Sleep call that requires 5ms precision on timer triggers (which is _usually_ true but not always guaranteed on CI machines. Tests shouldn't use magic timeout values when a deterministic alternative is available, and since the channel code turned out to be unrelated to the flakiness I think we should keep it.) (cherry picked from commit cb097b4) Co-authored-by: Fae Charlton <[email protected]>
…3447) Disable the flaky test `metricbeat/module/zookeeper/test_zookeeper`, reported in elastic#43385. Also add a message to the failing assertions indicating the actual data the tests failed on, so when a failure does happen we can see what caused it. (cherry picked from commit 9e29bcb) Co-authored-by: Fae Charlton <[email protected]>
Made with ❤️️ by updatecli Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…astic#44769) (elastic#44778) (cherry picked from commit df335f3) Co-authored-by: subham sarkar <[email protected]>
Made with ❤️️ by updatecli Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…lastic#44810) (cherry picked from commit b91d891) Co-authored-by: Tiago Queiroz <[email protected]>
…ebian11 (elastic#44819) * Explicitly crossbuild linux/arm with debian11 (elastic#44816) * Crossbuild linux/arm with debian11. * Update changelog. (cherry picked from commit 331c32e) * Fix conflict in changelog. --------- Co-authored-by: Craig MacKenzie <[email protected]>
Made with ❤️️ by updatecli Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…24.4 (elastic#44841) * [Automation] Bump Golang version to 1.24.4 (elastic#44696) * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * Update changelog. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Anderson Queiroz <[email protected]> Co-authored-by: Craig MacKenzie <[email protected]> Co-authored-by: Dimitrios Liappis <[email protected]> (cherry picked from commit 6286492) # Conflicts: # libbeat/docs/version.asciidoc * Fix conflict in libbeat/docs/version.asciidoc --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Craig MacKenzie <[email protected]>
…ection (elastic#44849) * fix: AWS S3 improve unexpected EOF detection (elastic#44813) * improve unexpected EOF detection Signed-off-by: Kavindu Dodanduwa <[email protected]> * add changelog entry Signed-off-by: Kavindu Dodanduwa <[email protected]> * fix lint issues Signed-off-by: Kavindu Dodanduwa <[email protected]> * review: receiver name Signed-off-by: Kavindu Dodanduwa <[email protected]> --------- Signed-off-by: Kavindu Dodanduwa <[email protected]> (cherry picked from commit a75b4e7) * Update CHANGELOG.next.asciidoc * fix import Signed-off-by: Kavindu Dodanduwa <[email protected]> --------- Signed-off-by: Kavindu Dodanduwa <[email protected]> Co-authored-by: Kavindu Dodanduwa <[email protected]> Co-authored-by: Kavindu Dodanduwa <[email protected]>
…csv" content-type filter support (elastic#44828) Currently content-type "text/csv" did not have official filtering support even though we support csv decoding. This made blobs having this content type defined were not picked up for processing. This PR as a "bugfix", adds support for explicit "text/csv" content-type filtering in the scheduler. (cherry picked from commit fba3749) --------- Co-authored-by: Shourie Ganguly <[email protected]>
…vers (elastic#44863) * otel: fix service.name for beats receivers (elastic#44831) * otel: fix service.name for beats receivers Beats receivers currently use the hostname as the "service.name" logger field. Adjust it to reflect the beat name for consistency with standard beats. * use require.Contains before Equal * fix linter issues (cherry picked from commit df3dcad) # Conflicts: # x-pack/filebeat/fbreceiver/receiver_test.go * fix conflicts --------- Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
Made with ❤️️ by updatecli Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…lastic#44646) This PR updates Sarama to the current Elastic fork, targeting the commit: ``` commit 7672917f26b6112627457d6bd1736a8636449c5b (HEAD, upstream/beats-fork) Merge: e414b10 a10b157 Author: Fae Charlton <[email protected]> Date: Tue Jun 3 13:51:45 2025 -0400 Merge pull request elastic#28 from faec/broker-rst-fix Clean up broker connections when returning a short-circuit error during metadata fetch ``` This includes the fix for elastic#44606. (cherry picked from commit 4195119) Co-authored-by: Fae Charlton <[email protected]>
…to v1.33.0/v0.127.0 (elastic#44869) * [chore] Update otel collector version to v1.33.0/v0.127.0 (elastic#44862)
…ching consumergroup member assignments (elastic#44871) * [metricbeat][kafka] fix panic when fetching consumergroup member assignments (elastic#44576) * [metricbeat][kafka] fix panic when fetching consumergroup member assignments * add changelog entry * mage fmt * fix linter * update new changelog * fix behaviour in case of sarama error in MemberDescription conversion * fix linter * move changelog entry to appropriate version section * remove entries from docs/release-notes/index.md --------- Co-authored-by: Ishleen Kaur <[email protected]> (cherry picked from commit 91de405) # Conflicts: # metricbeat/module/kafka/broker_test.go * resolve merge conflicts * fix linter errors in metricbeat/module/windows * fix linter errors in metricbeat/module/windows * fix missing import * fix linter errors in metricbeat/module/windows * fix linter errors in metricbeat/module/windows * fix linter errors in metricbeat/module/windows * fix linter errors in metricbeat/module/windows * fix linter errors in metricbeat/module/windows --------- Co-authored-by: stefans-elastic <[email protected]>
…atus updating (elastic#44887) - Add fleet input status updating to the UDP input - Removed redundant embedded struct selectors (cherry picked from commit cbe3da9) --------- Co-authored-by: Taylor Swanson <[email protected]> Co-authored-by: Taylor Swanson <[email protected]>
* [FIPS] Disable Microsoft Go telemetry * Add CHANGELOG entry * Remove check for MS_GOTOOLCHAIN_TELEMETRY_ENABLED from package. That env var affects the behavior of the Go toolchain at build time, not the behavior of the Beats binaries at runtime. (cherry picked from commit b9ce100) Co-authored-by: Shaunak Kashyap <[email protected]>
Made with ❤️️ by updatecli Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 94df681) Co-authored-by: Shaunak Kashyap <[email protected]>
…IPS builds (elastic#44906) * Disable Metricbeat `mssql` module in FIPS builds (elastic#44890) * Exclude non-generated Go code from FIPS build * Add doc about module availability * Adding CHANGELOG entry * Adding doc.go files to workaround excluding all Go files in build * Update PR number in CHANGELOG entry * Remove CHANGELOG entry (cherry picked from commit 9f5988f) * Running mage update --------- Co-authored-by: Shaunak Kashyap <[email protected]>
…uilds (elastic#44891) (elastic#44910) * Exclude Azure provider in add_cloud_metadata processor in FIPS builds * Add warning to doc * Adding CHANGELOG entry * Updating PR number in CHANGELOG entry * Clarify provider in CHANGELOG entry * Do not compile Azure provider code * Do not compile Azure provider tests * Remove CHANGELOG entries (cherry picked from commit 383a4c6) Co-authored-by: Shaunak Kashyap <[email protected]>
…stic#44905) * Add doc about module availability * Exclude non-generated Go code from FIPS build * Adding CHANGELOG entry * Adding doc.go files to workaround excluding all Go files in build * Run make check * Remove CHANGELOG entry (cherry picked from commit 0425c03) Co-authored-by: Shaunak Kashyap <[email protected]>
* add otel test binary
…t polling interval `period` 10s -> 60s (elastic#44876) * [metricbeat] [mongodb] increase default polling interval `period` 10s -> 60s (elastic#44781) (cherry picked from commit f889b64) * make update --------- Co-authored-by: mykola-elastic <[email protected]>
elastic#44689) * [Heartbeat] Adds maintenance windows !! (elastic#41508) * Add maint windows * Initial maint win MVP * added maintenance windows * destroy cluster * format * revert file * revert file * added lib * revert * space * add license * update * update * fix tests * lint * skip run once * Fix linting * Remove unused fields * Make update * add more test cases * utc * lint * handle errors * bit of refactor * emilio suggestion * More PR feedback * lint * add validation for map * nil condition * set count to default * add validation for only daily * add dt start validation * revrt * revrt * revert * revert * format * PR feedback * add docs * Update heartbeat/monitors/maintwin/maintwin.go Co-authored-by: Emilio Alvarez Piñeiro <[email protected]> * Update heartbeat/monitors/maintwin/maintwin.go Co-authored-by: Emilio Alvarez Piñeiro <[email protected]> * fomat * change log --------- Co-authored-by: Andrew Cholakian <[email protected]> Co-authored-by: emilioalvap <[email protected]> Co-authored-by: Emilio Alvarez Piñeiro <[email protected]> (cherry picked from commit f6fb08d) # Conflicts: # go.mod # go.sum * Fix conflicts --------- Co-authored-by: Shahzad <[email protected]> Co-authored-by: emilioalvap <[email protected]>
Made with ❤️️ by updatecli Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This pull request doesn't have a |
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
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.
metrics_count
to Prometheus module ifmetrics_count
istrue
#40411) {,x-pack/}metricbeat/module/prometheus/{collector,remote_write}: Addmetrics_count
to Prometheus module ifmetrics_count
istrue
([8.x](backport #40411) {,x-pack/}metricbeat/module/prometheus/{collector,remote_write}: Addmetrics_count
to Prometheus module ifmetrics_count
istrue
#40784)path
setting. (Fix nil pointer deref if the file output lacks apath
setting. #40992) ([8.x](backport #40992) Fix nil pointer deref if the file output lacks apath
setting. #41030)flag.CommandLine
infunc init()
(Don't register cfgfile flags onflag.CommandLine
infunc init()
#40993) ([8.x](backport #40993) Don't register cfgfile flags onflag.CommandLine
infunc init()
#41007)replace
directive ingo.mod
(Add linting for thereplace
directive ingo.mod
#41086) ([8.x](backport #41086) Add linting for thereplace
directive ingo.mod
#41102)flag.CommandLine
infunc init()
" (Revert "Don't register cfgfile flags onflag.CommandLine
infunc init()
" #41152) ([8.x](backport #41152) Revert "Don't register cfgfile flags onflag.CommandLine
infunc init()
" #41161)github.com/elastic/go-sfdc
tomaster@8e176480d727
(Bumpgithub.colasdn.workers.dev/elastic/go-sfdc
tomaster@8e176480d727
#41192) ([8.x](backport #41192) Bumpgithub.colasdn.workers.dev/elastic/go-sfdc
tomaster@8e176480d727
#41201)add_processor_metadata
andadd_docker_metadata
processors (Fix cgroup helper init inadd_processor_metadata
andadd_docker_metadata
processors #41108) ([8.x](backport #41108) Fix cgroup helper init inadd_processor_metadata
andadd_docker_metadata
processors #41185)add_session_metadata
processor ([auditbeat] Use shared process cache inadd_session_metadata
processor #40934) ([8.x](backport #40934) [auditbeat] Use shared process cache inadd_session_metadata
processor #41250)8.x
to8.17.0
#41272)DEV=true
for snapshot packaging (RemoveDEV=true
for snapshot packaging #41365) ([8.x](backport #41365) RemoveDEV=true
for snapshot packaging #41374)values
in lowercase processor ([libbeat]: Add support forvalues
in lowercase processor #41530) ([8.x](backport #41530) [libbeat]: Add support forvalues
in lowercase processor #41533)getDevicePerformanceScores
errors #41622) [meraki] LoggetDevicePerformanceScores
errors ([8.x](backport #41622) [meraki] LoggetDevicePerformanceScores
errors #41659)location_label
config in GCP Metrics Metricset (#41626) (#41852)--
command line args (#42204)native
orpath
tofingerprint
for Filestream inputs (#42126)merge_results: true
(#42271) (#42285)bulk_max_size
andpreset
(#42312) (#42429)ssl.verification_mode
(#42368) (#42461)pipeline
needs to be lowercase (#42438) (#42459)include_matches
(#42636)hostfs
provider foradd_session_metadata
(#42398) (#42792)v0.19.0
(#43709)GetOrganizationWirelessDevicesChannelUtilizationByDevice
for channel utilization data (#44370)nil
checks for Resty response in Meraki API calls (#44367)includes
(#44699) (#44757)go.mongodb.org/mongo-driver
fromv1.14.0
->v1.17.4
(#44769) (#44778)mssql
module in FIPS builds (#44906)add_cloud_metadata
processor in FIPS builds (#44891) (#44910)azure
module in FIPS builds (#44885) (#44905)period
10s -> 60s (#44876)