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.

Sign up for GitHub

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

Jump to bottom

Explore/Loki: Show results of instant queries only in table and time series only in graph #25845

Merged
merged 5 commits into from Jun 30, 2020
Merged

Explore/Loki: Show results of instant queries only in table and time series only in graph #25845

merged 5 commits into from Jun 30, 2020

Conversation

ivanahuckova
Copy link
Member

What this PR does / why we need it:
As implemented for Prometheus in #24508 and #24018, in Explore, we want to display result of metrics queries in following way:

  • results of instant queries display only in table
  • results of non-instant metric queries only in graph

Which issue(s) this PR fixes:

Fixes #25553 (comment)

@ivanahuckova ivanahuckova requested a review from a team as a code owner June 25, 2020 15:54
@ivanahuckova ivanahuckova requested review from zoltanbedi and removed request for a team June 25, 2020 15:54
@ivanahuckova ivanahuckova self-assigned this Jun 25, 2020
@ivanahuckova ivanahuckova removed the request for review from zoltanbedi June 25, 2020 16:07
@ivanahuckova ivanahuckova added this to the 7.1 milestone Jun 25, 2020
@ivanahuckova ivanahuckova requested review from a team, torkelo and hugohaggmark and removed request for a team June 29, 2020 12:26
@ivanahuckova ivanahuckova removed the request for review from hugohaggmark June 29, 2020 12:29
zoltanbedi
zoltanbedi approved these changes Jun 29, 2020
View reviewed changes
Copy link
Member

@zoltanbedi zoltanbedi left a comment

Choose a reason for hiding this comment

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

lgtm 🎈

@ivanahuckova ivanahuckova mentioned this pull request Jun 29, 2020
Merged
@ivanahuckova ivanahuckova merged commit 69f9b6f into master Jun 30, 2020
Observability (deprecated, use Observability Squad) automation moved this from Under review to Done Jun 30, 2020
@ivanahuckova ivanahuckova deleted the ivana/loki-metrics-result-display branch June 30, 2020 07:25
bergquist added a commit to bergquist/grafana that referenced this pull request Jun 30, 2020
@bergquist
Merge branch 'master' into linting_provisioning_notifiers
86d4e43 
* master: (135 commits)
  Docs: Changelog update 7.05 & latest.json update (grafana#25941)
  Fix: Value mappings match against string values (grafana#25929)
  Grafana-UI: Add FileUpload (grafana#25835)
  Query history: Add search for query history and starred queries (grafana#25747)
  Explore: Remove legend formatting when switching from panel to Explore (grafana#25848)
  Added options to customize chart data listening (grafana#25918)
  Provisioning: Use folders structure from the file system to create desired folders in dashboard provisioning. (grafana#23117)
  CircleCI: Upgrade grabpl (grafana#25939)
  DataLinks: Add internal links in table and allow custom query (grafana#25613)
  Docker: Upgrade to base on Alpine 3.12 (grafana#25936)
  TimeZonePicker: added possibility to toggle if internal time zones should be included or not. (grafana#25934)
  grafana/ui: Fix storybook dev (grafana#25928)
  Chore: Disable scopelint for tests (grafana#25923)
  Explore/Loki: Fix field type in table for instant queries (grafana#25907)
  Explore/Loki: Show results of instant queries only in table and time series only in graph (grafana#25845)
  grafana-ui: Make output chunks correct (grafana#25922)
  Chore: Fix spelling (grafana#25905)
  chore: fix lint breaking build (grafana#25916)
  Explore: Add join transform for timeseries shown in table (grafana#25906)
  Backend: use latest Go plugin sdk (grafana#25909)
  ...
ryantxu pushed a commit that referenced this pull request Jun 30, 2020
@ivanahuckova @ryantxu
Explore/Loki: Show results of instant queries only in table and time …
a10b6b7 
…series only in graph (#25845)

* Show results of instant queries only in table and rest in graph

* Add type to QueryResultMeta

* Update log row hover background only if context is not open

* Revert "Update log row hover background only if context is not open"

This reverts commit 144197c.
dprokop added a commit that referenced this pull request Jul 1, 2020
@ryantxu @dprokop
@RichiH @ivanahuckova @aknuds1 @mckn @aocenas @nabokihms @stevenvachon @Clarity-89 @tskarhed @peterholmberg @torkelo @papagian @marefr @bergquist @kylebrandt @oddlittlebird @jsoref
Graph Panel: use FieldConfig for displayName and DataLinks (#25917)
1716b70 
* graph with new controls

* graph with new controls

* Fix categories

* fix test imports

* Chore: Fix spelling (#25905)

* grafana-ui: Make output chunks correct (#25922)

* Explore/Loki: Show results of instant queries only in table and time series only in graph (#25845)

* Show results of instant queries only in table and rest in graph

* Add type to QueryResultMeta

* Update log row hover background only if context is not open

* Revert "Update log row hover background only if context is not open"

This reverts commit 144197c.

* Explore/Loki: Fix field type in table for instant queries (#25907)

* Update field type for instant queries to number

* Remove fieldtype as in prometheus

* Revert "Remove fieldtype as in prometheus"

This reverts commit f887ad1.

* Chore: Disable scopelint for tests (#25923)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* grafana/ui: Fix storybook dev (#25928)

* Minimize css and js only for storybook build

* Update CodeEditor story, make it internal

* Update storybook webpack config

* TimeZonePicker: added possibility to toggle if internal time zones should be included or not. (#25934)

* made some small adjustments after feedback.

* made the flag optional.

* Docker: Upgrade to base on Alpine 3.12 (#25936)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* DataLinks: Add internal links in table and allow custom query (#25613)

* Add internal links in table and with custom query

* Add specific types for internal and external link

* Change the datalink types to be more backward compatible

* Refactor the link utils for explore

* Add internal linking to table panels

* Fix derived field condition

* Prettify

* Add and fix tests

* Prettify

* Fix imports and tests

* Remove unused type

* Update packages/grafana-data/src/types/explore.ts

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

* Update packages/grafana-data/src/types/explore.ts

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

* CircleCI: Upgrade grabpl (#25939)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Provisioning: Use folders structure from the file system to create desired folders in dashboard provisioning. (#23117)

Fixes #12016

* Added options to customize chart data listening (#25918)

* Explore: Remove legend formatting when switching from panel to Explore (#25848)

* Remove legend formatting when switching from panel to explore

* Add test coverage

* Query history: Add search for query history and starred queries (#25747)

* Add searching functionality to Queries tab

* Implement search for starred queries

* Update tests and add test coverage for searching

* Changes based on provided feedback

* Remove redundant storing of results

* Update naming of onSearchFilterChange function in tests

* Update filterQueriesBySearchFilter function

* Update filterQueriesBySearchFilter function

* Debounce search

* Remove console.log()

* Use useDebouncedCallback

* Update tests, remove redundant props

* When in starred, search only in starred

* Add timefilter as dependency

* Remove redundant dependency, refactor

* Grafana-UI: Add FileUpload (#25835)

* Grafana UI: Setup component

* Grafana UI: DashboardFileUpload => FileUpload

* Grafana UI: Expand docs

* Grafana UI: Add className

* Grafana UI: Update import

* Grafana UI: Clarify props

* Update packages/grafana-ui/src/components/FileUpload/FileUpload.tsx

Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>

* Grafana UI: Style icon

* Grafana UI: Show uploaded file name

* Grafana UI: Add tests

* Grafana UI: Add useStyles + useCallback

* Grafana UI: Remove stylesFactory

* Grafana UI: Revert to useTheme

Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>

* Fix: Value mappings match against string values (#25929)

* Use standard input for value mappings value

* add test and case for matching string values

* re add number on rangemap

* remove FieldTypeNumber required

* Docs: Changelog update 7.05 & latest.json update (#25941)

* Docs: Changelog update for 7.0.5

* Update latest.json

* Fixed alignment

* Stackdriver: Rename Stackdriver to Google Cloud Monitoring (#25807)

* Update backend

* Update frontend

* Keep old plugin id

* Update docs

* Place doc images to a new directory

* Legacy support for stackdriver-auto alignment

* Consistent plugin name

* Apply suggestions from code review

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>

* Update docs

* Update public/app/plugins/datasource/cloud-monitoring/README.md

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Add reference to the data source formerly being named Stackdriver

* Update pkg/models/datasource.go

Co-authored-by: Carl Bergquist <carl@grafana.com>

* Fix gofmt

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
Co-authored-by: Carl Bergquist <carl@grafana.com>

* Fix strict null errors that resulted from search (#25950)

* Arrow: when exporting arrow use the calculated names (#25871)

* PanelHeader: Fixed loading icon position (#25949)

* PanelHeader: Fixed loading icon position

* revert back to text weak color

* Azure/Log Analytics: return more error information (#25937)

When there is an error message in the HTTP response, this copies that error so it is relayed to the user by being shown in the frontend.

This also makes it so when there is an error the interpolated query string (ExecutedQueryString) is returned so users can see it in the query inspector.

* Azure: Multiple dimension support for Azure Monitor Service (#25947)

Azure Monitor (metrics) support multiple dimensions instead of just one.

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>

* Docs: Update alert-list-panel.md (#25779)

Fixed minor typo and format updates

* Docs: Update add-a-panel.md (#25780)

* Linting fixes for the provisioning package (#25690)

* Chore: whatwg-fetch version bump (#25952)

* Use latest fetch polyfill/shim

* Updated lockfile

* Monaco: option to hide line numbers (#25920)

* Docs: Reorganize reference topics (#25915)

* moved annotations.md

* Update annotations.md

* moved dashboard_folders.md

* moved dashboard_history.md

* moved playlist.md

* moved search.md

* migrations test

* docs: spelling (#24383)

* Docs: spelling

* Docs: spelling (contribute/ directory)

* Drop whats-new-in changes

* migrations test

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Richard Hartmann <RichiH@users.noreply.github.com>
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>
Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
Co-authored-by: Maksim Nabokikh <32434187+nabokihms@users.noreply.github.com>
Co-authored-by: Steven Vachon <contact@svachon.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
Co-authored-by: Peter Holmberg <peterholmberg@users.noreply.github.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Carl Bergquist <carl@grafana.com>
Co-authored-by: Kyle Brandt <kyle@grafana.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
@mckn mckn mentioned this pull request Jul 1, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aocenas aocenas aocenas approved these changes

@zoltanbedi zoltanbedi zoltanbedi approved these changes

@davkal davkal Awaiting requested review from davkal

@torkelo torkelo Awaiting requested review from torkelo

Assignees

@ivanahuckova ivanahuckova

Labels
add to changelog area/explore datasource/Loki
Projects
Observability (deprecated, use Observ...
  
Done
Milestone
7.1-beta1
Development

Successfully merging this pull request may close these issues.

Explore incorrect table result on Loki metric queries
3 participants
@ivanahuckova @aocenas @zoltanbedi