IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
17,877 Commits 1,123 Branches 715 Tags
91ea8dccf5b32cd657d6f448225d1e06f5a0ee5d
Commit Graph
17877 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Kaltschmidt 91ea8dccf5 Explore: Fix JS error when switching between 2 prometheus datasources 
- since the DataQuery rewrite, Explore starts by submitting its queries (Explore cant know if the queries are emtpty)
- The datasource intercepts an empty query and returns an empty list of time series, and also no table for the table query.
- The query hinter then received no series to analyse and was not guarding against this.
- This PR adds this guard.
 2018-11-26 13:43:22 +01:00
Torkel Ödegaard efcbb92b3f Merge pull request #14170 from grafana/davkal/explore-prometheus-range-sort 
Sort Prometheus range suggestions by length
v5.,2.4 		2018-11-23 19:22:24 +01:00
David Kaltschmidt 575d888472 Fix tests to account for sortText 2018-11-23 16:53:46 +01:00
Leonard Gram 539036fd0f build: always test publisher. 2018-11-23 16:51:01 +01:00
Leonard Gram 82c98a5ff4 build: packages linked to dl.grafana.com. 2018-11-23 16:51:01 +01:00
Marcus Efraimsson 1949c8eb57 update changelog 2018-11-23 15:41:47 +01:00
Marcus Efraimsson 81a426f05d Merge pull request #14175 from grafana/11977_regression 
Regression: fix handle of elasticsearch 6.0+ version
 2018-11-23 06:36:51 -08:00
Marcus Efraimsson a022284cb0 fix handle of elasticsearch 6.0+ version 2018-11-23 15:24:16 +01:00
Torkel Ödegaard 92c5755175 minor style fix 2018-11-23 15:10:45 +01:00
Marcus Efraimsson 9aa4d71550 docs: fix old ldap url redirect 2018-11-23 14:31:21 +01:00
David f4bc023147 Merge pull request #14171 from grafana/davkal/explore-fix-empty-suggestion 
Explore: make query field suggestions more robust
 2018-11-23 13:14:30 +01:00
David Kaltschmidt f831836fa7 Explore: make query field suggestions more robust 
- drop invalid history items
- make highlighter more robust by defaulting to empty string on text to highlight
 2018-11-23 12:25:43 +01:00
flopp999 91d97ab5b5 Fix abbreviations of Litre/min and milliLitre/min (#14114) 2018-11-23 02:48:22 -08:00
David 16e7ae4e69 Merge pull request #14169 from grafana/davkal/explore-logging-keep-labels 
Explore: switching to logging should keep prometheus labels in case o…
 2018-11-23 11:47:39 +01:00
David Kaltschmidt ecaee88efe Sort Prometheus range suggestions by length 
- add sortText property to range completion items
 2018-11-23 11:43:21 +01:00
David Kaltschmidt b778b5350a Explore: swtiching to logging should keep prometheus labels in case of error 
Logging's query importer drops all labels that are not common to both datasources.

- keep labels if label lookup of logging datasource came back empty
- easier to remove labels than having to add them in the first place
 2018-11-23 11:15:25 +01:00
Torkel Ödegaard 56d95e7913 tweaks to gf-inline-form style PR #14154 change 2018-11-23 08:06:48 +01:00
Torkel Ödegaard ec23b4c607 Merge pull request #14154 from bergquist/gf-form-margin 
Margin when listing multiple gf-form
 2018-11-23 08:05:28 +01:00
Torkel Ödegaard 81cc24c123 Merge branch 'davkal/sticky-footer' 2018-11-23 07:50:47 +01:00
Torkel Ödegaard 0cb47cb3d4 Merge pull request #14162 from grafana/docs_signout_redirect_url 
docs: signout_redirect_url description in auth overview
 2018-11-23 07:46:24 +01:00
Marcus Efraimsson 5ebb201caa docs: signout_redirect_url description in auth overview 2018-11-22 15:59:15 +01:00
David Kaltschmidt c928c546a3 Sticky footer for all pages 
Currently the footer is based on top margins which looks odd on big screen sizes.
Also, the footer shows up on the top of the page on pages take a moment to load (while ng-view is rendering).

- True sticky footer based on flexbox
- Ensure footer stays at bottom while ng-view div does not exist yet
 2018-11-22 13:15:29 +01:00
David 377eaa891c Merge pull request #14147 from grafana/davkal/explore-data-query 
Explore: Introduce DataQuery interface for query handling
 2018-11-22 12:01:37 +01:00
David Kaltschmidt 9e94d22401 Added comments 2018-11-22 12:00:41 +01:00
David Kaltschmidt 21ee85b1e2 Fix issue with deleting a query (empty string not updating) 2018-11-22 11:14:46 +01:00
David Kaltschmidt bbaa5b63c8 Fix history rendering for DataQuery 2018-11-22 11:02:53 +01:00
bergquist dc2ebeb7c0 margin when listing multiple gf-form should be right 
when listing multiple gf-form elements this style is
applied to all elements except the first. By having the
margin on the right side there will always be some margin
between all gf-forms
 2018-11-22 11:00:27 +01:00
Marcus Efraimsson dffb4c8a46 Merge pull request #14153 from zyseeker/patch-1 
Fix a typo in doc about alerting
 2018-11-22 00:17:56 -08:00
Zhang Yong 4f236ca465 Fix a typo 
Fix a typo
 2018-11-22 15:17:31 +08:00
Marcus Efraimsson 572ca5a010 changelog: add notes about closing #14150 2018-11-21 18:28:05 +01:00
Marcus Efraimsson 40a38552a9 Merge pull request #14151 from grafana/14150_cloudwatch 
Fix invalid time range causes panic in Cloudwatch datasources
 2018-11-21 09:23:51 -08:00
Marcus Efraimsson a6a1362ad1 temporary fix for starting grafana not running systemd 2018-11-21 18:15:28 +01:00
Marcus Efraimsson 3534762f49 cloudwatch: handle invalid time ranges 2018-11-21 17:51:02 +01:00
Marcus Efraimsson 879aed7d06 cloudwatch: recover/handle panics when executing queries 2018-11-21 17:49:17 +01:00
David 1125ca4d79 Merge pull request #14014 from miqh/feat/explore-toggle-series 
Add ability to toggle visibility of graph series in explore section
 2018-11-21 17:31:46 +01:00
Carl Bergquist c3d64e0352 Merge pull request #14148 from bergquist/alerting_options_to 
updates time range options for alert queries
 2018-11-21 17:25:32 +01:00
Carl Bergquist acf8d43682 Merge pull request #14056 from mjtrangoni/fix-errcheck-issues 
Fix errcheck issues
 2018-11-21 17:23:56 +01:00
David Kaltschmidt 331d419d4f Combine query functions 2018-11-21 17:21:13 +01:00
David Kaltschmidt 22987ee75f Renamed targets to queries 2018-11-21 16:28:30 +01:00
bergquist 14688766ef updates time range options for alert queries 
add some new options for the to value.
removes '1s' option for from since thats unreasonable low

closes #12134
 2018-11-21 15:43:37 +01:00
bergquist 60c291c8dc format: remove </input> and align tabs 2018-11-21 15:42:25 +01:00
Carl Bergquist c852acaeca Merge pull request #14143 from bergquist/docs_alerting_for 
Adds example timeline in docs for alerting for
 2018-11-21 15:15:39 +01:00
David Kaltschmidt b3161bea5a Explore: Introduce DataQuery interface for query handling 
- Queries in Explore have been string based
- This PR introduces the use of the DataQuery type to denote all queries handled in Explore
- Within Explore all handling of DataQueries is transparent
- Modifying DataQueries is left to the datasource
- Using `target` as variable names for DataQueries to be consistent with the rest of Grafana
 2018-11-21 14:45:57 +01:00
Michael Huynh a333c31ea8 Fix set utilities for explore section 
Discovered implementation issues with the set utilities used in the
explore section after adding some tests. Added tests to reinforce the
expected behaviour of the utility functions.

Related: #13522
 2018-11-21 21:42:53 +08:00
Marcus Efraimssonandbergquist f74a7cd97c typos in docs/sources/alerting/rules.md 
Co-Authored-By: bergquist <carl@grafana.com>
 2018-11-21 14:41:51 +01:00
Marcus Efraimssonandbergquist fdbccdc347 typos in docs/sources/alerting/rules.md 
Co-Authored-By: bergquist <carl@grafana.com>
 2018-11-21 14:41:35 +01:00
Torkel Ödegaard 1976e18591 Merge pull request #14145 from grafana/fix-legend-show-false 
fixed issue with new legend not checking if panel.legend.show
 2018-11-21 14:40:09 +01:00
Torkel Ödegaard 0731b8635b fixed failing graph tests 2018-11-21 13:53:32 +01:00
bergquist 4bd8b2c130 gfdev: fixes unparseable for duration 2018-11-21 11:41:54 +01:00
Torkel Ödegaard cab92f88af fixed issue with new legend not checking if panel.legend.show 2018-11-21 11:38:15 +01:00