Skip to content

MONIT-34300: Hide sensible config option (token) from the Proxy log - #845

Merged
joannatk merged 1 commit into
devfrom
MONIT-34300
Apr 28, 2023
Merged

MONIT-34300: Hide sensible config option (token) from the Proxy log#845
joannatk merged 1 commit into
devfrom
MONIT-34300

Conversation

@laullon

@laullon laullon commented Apr 18, 2023

Copy link
Copy Markdown
Contributor

No description provided.

@joannatk joannatk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@laullon laullon changed the title Hide sensible config option (token) from the Proxy log MONIT-34300: Hide sensible config option (token) from the Proxy log Apr 28, 2023
@joannatk
joannatk requested a review from amitw-vmware April 28, 2023 17:16

@formanojhr formanojhr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@amitw-vmware amitw-vmware left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

lgtm

@sbhakta-vmware sbhakta-vmware left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

lgtm. QA certified

@joannatk
joannatk merged commit 2e5a730 into dev Apr 28, 2023
@joannatk
joannatk deleted the MONIT-34300 branch April 28, 2023 19:32
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants