Merge dev to 12.x branch #841
Merged
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
* MONIT-32483 record payloads batch before forwarding to vRLIC * MONIT-32483 surround logging with try-catch
Co-authored-by: Joanna Ko <[email protected]>
* MONIT-34093 - Upgrade to snakeyaml 2.0 for CVE-2022-1471 - explicitly add dependency on snakeyaml since we import it directly in the code - update test to use explict loadOptions on the YamlFactory for the objectmapper - code cleanup in LogsIngesterTest
formanojhr
approved these changes
Apr 5, 2023
laullon
added a commit
that referenced
this pull request
Apr 12, 2023
* release-12.x: [release] prepare for next development iteration [release] prepare release for proxy-12.3 update open_source_licenses.txt for release 12.3 Merge dev to 12.x branch (#841)
laullon
added a commit
that referenced
this pull request
May 10, 2023
* dev: (37 commits) MONIT-30797: CVE-2021-20293 (6.1) - wavefront-proxy (resteasy-jaxrs) (#844) [release] prepare for next development iteration [release] prepare release for proxy-12.4 update open_source_licenses.txt for release 12.4 update open_source_licenses.txt for release 12.4 MONIT-34326: Remove preprocessor rules returned from server (#848) MONIT-34487: Force GZIP on server api requests (#849) MONIT-34300: Hide sensible config option (token) from the Proxy log (#845) MONIT-33770: Proxy Ingest without Admin Auth (#842) [release] prepare for next development iteration [release] prepare release for proxy-12.3 update open_source_licenses.txt for release 12.3 Merge dev to 12.x branch (#841) Monit 34005: Fix crash on bad URL config (#837) Merge dev to 12.x branch (#840) MONIT-34093 - Upgrade to snakeyaml 2.0 for CVE-2022-1471 (#839) [release] prepare for next development iteration [release] prepare release for proxy-12.2 update open_source_licenses.txt for release 12.2 Fix failing HttpEndtoEndTest (#835) ... # Conflicts: # proxy/pom.xml # proxy/src/main/java/com/wavefront/agent/AbstractAgent.java # proxy/src/main/java/com/wavefront/agent/ProxyCheckInScheduler.java # proxy/src/main/java/com/wavefront/agent/ProxyConfig.java # proxy/src/main/java/com/wavefront/agent/PushAgent.java # proxy/src/main/java/com/wavefront/agent/api/APIContainer.java # proxy/src/main/java/com/wavefront/agent/api/NoopProxyV2API.java # proxy/src/main/java/com/wavefront/agent/config/ReportableConfig.java # proxy/src/main/java/com/wavefront/agent/core/handlers/DeltaCounterAccumulationHandlerImpl.java # proxy/src/main/java/com/wavefront/agent/core/handlers/HistogramAccumulationHandlerImpl.java # proxy/src/main/java/com/wavefront/agent/core/handlers/ReportPointHandlerImpl.java # proxy/src/main/java/com/wavefront/agent/core/handlers/SpanHandlerImpl.java # proxy/src/main/java/com/wavefront/agent/data/LogDataSubmissionTask.java # proxy/src/main/java/com/wavefront/agent/handlers/AbstractReportableEntityHandler.java # proxy/src/main/java/com/wavefront/agent/handlers/EventHandlerImpl.java # proxy/src/main/java/com/wavefront/agent/handlers/ReportLogHandlerImpl.java # proxy/src/main/java/com/wavefront/agent/handlers/ReportSourceTagHandlerImpl.java # proxy/src/main/java/com/wavefront/agent/handlers/SpanLogsHandlerImpl.java # proxy/src/main/java/com/wavefront/agent/listeners/AbstractLineDelimitedHandler.java # proxy/src/main/java/com/wavefront/agent/listeners/RelayPortUnificationHandler.java # proxy/src/main/java/com/wavefront/agent/listeners/WavefrontPortUnificationHandler.java # proxy/src/main/java/com/wavefront/agent/logsharvesting/InteractiveLogsTester.java # proxy/src/main/java/com/wavefront/agent/preprocessor/InteractivePreprocessorTester.java # proxy/src/main/java/com/wavefront/agent/preprocessor/PreprocessorConfigManager.java # proxy/src/test/java/com/wavefront/agent/ProxyConfigTest.java # proxy/src/test/java/com/wavefront/agent/PushAgentTest.java # proxy/src/test/java/com/wavefront/agent/histogram/PointHandlerDispatcherTest.java # proxy/src/test/java/com/wavefront/agent/logsharvesting/LogsIngesterTest.java
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.
No description provided.