IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
18,639 Commits 5,454 Branches 554 Tags 1.9 GiB
74c2b22a77
Commit Graph

18639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
6dc050d01e
Merge pull request #14401 from evergage/14399-cloudwatch-bouncerate 
Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate.  …
 2018-12-09 11:06:01 +01:00
David Kaltschmidt
60ee4499e7 Explore: Fix timepicker inputs for absolute dates 
- Timepicker needs to keep from and to internally as strings
for the fully controlled inputs
- make sure from and to are strings when time is reset
 2018-12-09 07:05:27 +01:00
AJ West
6c95acc837 Switch to global match for full browser support of escaped custom vars 2018-12-08 18:23:08 -05:00
AJ West
2b3d366f7c Allow backslash escaping in custom variables 2018-12-08 17:31:05 -05:00
Torkel Ödegaard
14cf846e73 Fixed issue with logs graph and stacking 2018-12-08 11:15:02 -08:00
Torkel Ödegaard
683b718e2b align yellow collor with graph in logs table 2018-12-08 09:45:02 -08:00
Torkel Ödegaard
a3dd29fb66 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-08 13:03:58 +01:00
Torkel Ödegaard
912dc0f2a9
Merge pull request #14392 from grafana/14377-develop-graph-options 
Removed graph side menu
 2018-12-08 13:03:42 +01:00
Torkel Ödegaard
1bb535bbe3 minor style change 2018-12-08 12:54:36 +01:00
Scott Glajch
62a5cd27ba Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate. Pull request #14399 2018-12-07 16:42:29 -05:00
Torkel Ödegaard
3d0c54a946 logs style polish 2018-12-07 12:13:23 -08:00
Torkel Ödegaard
efede26eea
Merge pull request #14382 from grafana/davkal/remove-explore-tab 
Remove Explore > "New tab" from sidebar
 2018-12-07 20:24:13 +01:00
Torkel Ödegaard
30c2cc4b5c allow sidemenu sections without children still have a hover menu/header 2018-12-07 11:14:32 -08:00
Torkel Ödegaard
cb59f388ca explore logs options styling 2018-12-07 17:23:35 +01:00
Torkel Ödegaard
bfbb44af03 transparent toggle style and new button group style 2018-12-07 17:15:46 +01:00
Peter Holmberg
a0a06911d8 Toggle buttons 2018-12-07 17:08:28 +01:00
Peter Holmberg
368f1f67e4 render a value mapping row 2018-12-07 16:55:58 +01:00
ijin08
bd589b61bd removed side menu from display options, kept overrides in display options, moved thresholds and time regions to its own section in visualization 2018-12-07 15:18:43 +01:00
Peter Holmberg
4f39df900c Merge remote-tracking branch 'origin/develop' into gauge-value-mappings 2018-12-07 15:10:32 +01:00
Torkel Ödegaard
79933299c7 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-07 15:09:09 +01:00
Peter Holmberg
d474fd1b58 Merge remote-tracking branch 'origin/develop' into gauge-value-mappings 2018-12-07 15:08:24 +01:00
Torkel Ödegaard
eb6d0e9f51 Merge branch 'master' into develop 2018-12-07 14:59:38 +01:00
bergquist
2b5b16f5d3 changelog: adds note about closing #11221 2018-12-07 14:50:41 +01:00
Carl Bergquist
93dee6d4c2
Merge pull request #11410 from PatrickSchuster/add_google_hangouts_chat_notifier 
Add Google Hangouts Chat notifier.
 2018-12-07 14:49:28 +01:00
bergquist
9eea585773 removes unused code 2018-12-07 14:39:44 +01:00
bergquist
5d720674e3 Merge branch 'master' into add_google_hangouts_chat_notifier 
* master: (322 commits)
  graphInterval needs to update after query execution, fixes #14364
  Explore: Parse initial dates
  Aligned styling of stats popover/box with rest of grafana & minor css refactoring
  Prometheus: Make result transformer more robust for empty responses
  Rebase fixes
  Explore: Logging line parsing and field stats
  fixed unit tests
  made unknown color theme aware and sync with graph color, some minor cleanup
  Explore: improve error handling
  use render props instead of cloneElement
  sort of a hacky way to figure if the small variation should be used for the label
  add basic button group component, using the the same label style as is
  explore logs styling
  wip: alternative level styling & hover effect
  wip: explore logs styling
  more detailed error message for loki
  If user login equals user email, only show the email once #14341
  UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons.  #14341
  wip: explore logs styling
  restoring monospace & making sure width are correct when hiding columns
  ...
 2018-12-07 14:31:13 +01:00
bergquist
a90bba859a fixes merge error 2018-12-07 14:17:09 +01:00
Erik Sundell
569f5e8d5e remove result format. might add this later 2018-12-07 14:13:05 +01:00
Erik Sundell
68c2d2631e filter out build in datasources. add unit test 2018-12-07 14:11:40 +01:00
Daniel Lee
687cf013bd
Merge pull request #14385 from grafana/davkal/fix-explore-date-parsing 
Explore: Parse initial dates
 2018-12-07 14:10:36 +01:00
Erik Sundell
b1a40992d3 Merge branch 'develop' of https://github.com/grafana/grafana into develop 2018-12-07 13:58:07 +01:00
Torkel Ödegaard
5d22cdab28 click on dashboard title moves you back to dashboard instead of search 2018-12-07 13:50:50 +01:00
Torkel Ödegaard
619b4b4872
Merge pull request #14336 from grafana/davkal/explore-line-parsing 
Explore: Logging line parsing and field stats
 2018-12-07 13:24:43 +01:00
Torkel Ödegaard
a89e21c561
Merge pull request #14386 from grafana/explore-fix-interval-update 
Explore: graphInterval needs to update after query execution
 2018-12-07 13:21:43 +01:00
Torkel Ödegaard
ef08b9cd2b graphInterval needs to update after query execution, fixes #14364 2018-12-07 13:07:08 +01:00
David Kaltschmidt
a990b69baa Explore: Parse initial dates 
- parse dates passed from URL
- keep everything local time for now
 2018-12-07 12:41:47 +01:00
Daniel Lee
140205a783
Merge pull request #14381 from grafana/davkal/fix-prometheus-transformation-error 
Prometheus: Make result transformer more robust for empty responses
 2018-12-07 12:22:45 +01:00
Torkel Ödegaard
7cb456ea23 Aligned styling of stats popover/box with rest of grafana & minor css refactoring 2018-12-07 11:28:22 +01:00
David Kaltschmidt
80d62013b2 Remove Explore > "New tab" from sidebar 
- we don't support tabs yet, might as well remove the entry
 2018-12-07 11:27:46 +01:00
Erik Sundell
45fbbe8021 initialize empty variables array in constructor so that datasources can use the array in explore 2018-12-07 11:27:11 +01:00
David Kaltschmidt
c0c06e4dd8 Prometheus: Make result transformer more robust for empty responses 
- some prometheus-compatible backends may return `null` instead of empty lists
- test for lists before iterating
- added tests for empty responses
 2018-12-07 11:22:55 +01:00
Torkel Ödegaard
b8b468f733
Merge pull request #14343 from grafana/develop-14333 
Update react panel header when changing angular panel settings
 2018-12-07 10:54:00 +01:00
Torkel Ödegaard
dbb34020ca
Merge pull request #14375 from moznion/fix_quota_updating 
Fix quota updating
 2018-12-07 10:38:32 +01:00
Erik Sundell
260d0189b6 add table support flag in influx config 2018-12-07 10:29:38 +01:00
Erik Sundell
97180d5106 add scoped vars to query options 2018-12-07 10:28:51 +01:00
David Kaltschmidt
fb4925a8c2 Rebase fixes 2018-12-07 10:22:52 +01:00
David Kaltschmidt
acd52e6a93 Explore: Logging line parsing and field stats 
Lazily parse lines and display stats for field when clicked on.

- log line parsers for JSON (basic), and logfmt
- delayed parsing in case user moves to other line
- reuse label stats for field stats
 2018-12-07 09:59:55 +01:00
Torkel Ödegaard
9cc4e05205
Merge pull request #14366 from grafana/14341-wide-picker-no-button 
Pickers with min-width instead of width
 2018-12-07 09:05:22 +01:00
Torkel Ödegaard
ef77748a1b
Merge pull request #14368 from grafana/explore-logs-styling-alt2 
Explore logs styling
 2018-12-06 22:30:06 +01:00
Torkel Ödegaard
e7fe0bd668 fixed unit tests 2018-12-06 12:29:55 -08:00