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

Explore: Don't parse log levels if provided by field or label #17180

Merged
merged 2 commits into from
May 27, 2019

Conversation

marefr
Copy link
Member

@marefr marefr commented May 20, 2019

What this PR does / why we need it:
If a field or a label named level is returned from datasource that is used as log level for the logs result instead of parsing the log level from the message.

Which issue(s) this PR fixes:
Closes #17122

Special notes for your reviewer:
#17182 makes testing fields having a field name level or not at least.

@marefr marefr added this to In progress in Kubecon via automation May 20, 2019
@marefr marefr added this to the 6.3 milestone May 21, 2019
Copy link
Member

@torkelo torkelo 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!

@marefr marefr merged commit a07296b into master May 27, 2019
Observability (deprecated, use Observability Squad) automation moved this from Under review to Done May 27, 2019
Kubecon automation moved this from In progress to Done May 27, 2019
@marefr marefr deleted the 17122_log_level branch May 27, 2019 16:43
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 30, 2019
…-grafanaui

* grafana/master: (92 commits)
  LDAP: remove unused function (grafana#17351)
  Enterprise: remove gofakeit dep (grafana#17344)
  Explore: Update time range before running queries (grafana#17349)
  Build(package.json): improve npm commands (grafana#17022)
  Chore: upgrade webpack analyser (grafana#17340)
  NewDataSourcePage: Add Grafana Cloud link (grafana#17324)
  CloudWatch: Avoid exception while accessing results (grafana#17283)
  Build: ignore absence of docker-compose (grafana#17331)
  Build(makefile): improve error handling (grafana#17281)
  adds auth example for the cli cherrypick task (grafana#17307)
  docs: remove my email from docs examples (grafana#17325)
  16365 change clashing variable names (grafana#17140)
  Frontend/SeriesData: Fix for convert SeriesData to Table format (grafana#17314)
  Frontend/utils: Import has only from lodash (grafana#17311)
  Frontend/utils: Add missing type  (grafana#17312)
  update v6.2-beta1 changelog with missing pr (grafana#17308)
  explore: don't parse log levels if provided by field or label (grafana#17180)
  HTTP Server: Serve Grafana with a custom URL path prefix (grafana#17048)
  update latest.json to latest stable version (grafana#17306)
  release: v6.2.1 changelog update (grafana#17303)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Kubecon
  
Done
Development

Successfully merging this pull request may close these issues.

Explore: Use log label from stream when present
3 participants