IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 17:43:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,422 Commits 5,447 Branches 554 Tags 1.9 GiB
0ac6d7cf4c
Commit Graph

2298 Commits

Author SHA1 Message Date
Marcus Efraimsson
6751bbc17f Merge branch 'master' into docs_v5.0 2018-02-22 15:55:44 +01:00
Torkel Ödegaard
aa3872a0e2 fix: elasticsearch terms size now allows custom values again, fixes #10124 2018-02-21 15:41:55 +01:00
Torkel Ödegaard
2f6e77af1e Merge branch 'master' into docs_v5.0 2018-02-21 10:47:14 +01:00
Alexander Zobnin
ceb8223ddf Fixes for heatmap panel in Grafana 5 (#10973) 
* heatmap: fix chart height

* heatmap: fix font size

* heatmap: fix legend size

* heatmap: fix rendering tests
 2018-02-21 09:16:56 +01:00
Patrick O'Carroll
1293fcadd2 added an if to check for null to sort null as 0 (#10961) 
* added an if to check for null to sort null as 0

* changed 0 to -Infinity
 2018-02-20 09:45:30 +01:00
Torkel Ödegaard
ae20366b01 graph: added 0.5 point radius option 2018-02-19 11:37:42 +01:00
Zachary Cava
710bb70746 [elasticsearch] Allow nested fields for annotation source (#10936) 2018-02-19 09:26:13 +01:00
Daniel Lee
6fa46d9539 plugins: update meta data for all core plugins 
So that the readme's can be published on Grafana.com
 2018-02-15 16:50:38 +01:00
Torkel Ödegaard
57103ec98a fix: refactoring #10922 2018-02-15 12:42:17 +01:00
Torkel Ödegaard
4b4e38531b Merge branch 'fix-10526' of https://github.com/alexanderzobnin/grafana 2018-02-15 11:46:33 +01:00
Alexander Zobnin
b4c51f8822 Fix phantomjs legend rendering issue, #10526 2018-02-15 12:59:14 +03:00
Carl Bergquist
fcca578f41 updates readmes for mysql and postgres (#10913) 
ref #10813
 2018-02-15 09:38:39 +01:00
Marcus Efraimsson
2b31465254 Merge branch 'master' into docs_v5.0 2018-02-12 14:29:22 +01:00
Alexander Zobnin
111b32290a Fixes for graphite tags editor (#10861) 
* graphite: don't fetch tags on editor init

* add debounce option to query editor directives

* graphite: debounce tag queries
 2018-02-09 16:20:30 +01:00
Torkel Ödegaard
f54ba20783 fix: css fix, found a better way to fix #10772 2018-02-06 13:01:23 +01:00
Alexander Zobnin
fd5e838f0e heatmap tooltip: minor refactor 2018-02-06 13:38:17 +03:00
Alexander Zobnin
ece9eb54b9 Merge branch 'master' of https://github.com/thattolleyguy/grafana into thattolleyguy-master 2018-02-06 11:38:33 +03:00
Daniel Lee
5d756707ab dashlist: scroll fix when no header 
The first item in the dashlist has a margin that messes up
the height calculation for the scroll bar when the Show headings
option is not selected. This fix adds a margin-top set to 0 for
the 1st item in the list in this case. This prevents a scrollbar
being shown incorrectly. Fixes #10772
 2018-02-05 19:22:15 +01:00
Daniel Lee
4ce862c5b4 scroll: use wheelpropagation. Ref #10772 
Once the vertical scrollbar comes to its end position, it should
allow the page scroll bar to start scrolling.
 2018-02-05 18:12:04 +01:00
Marcus Efraimsson
49c02aa8d2 Merge branch 'master' into docs_v5.0 2018-02-05 15:23:32 +01:00
Torkel Ödegaard
07fa2f1722
fix: alert list links did not work, changed dashboardUri to Url, this is breaking api change in alert api (#10756) 2018-02-05 09:42:41 +01:00
Tyler Tolley
ca3c1d8c63 #10724 Fix whitespace 2018-02-02 09:31:05 -07:00
Tyler Tolley
bde5499552 #10724 Fix finding the x bucket 2018-02-02 07:29:54 -07:00
Marcus Efraimsson
b135df9a6c Merge remote-tracking branch 'upstream/master' into 7883_new_url_structure 2018-02-01 10:48:06 +01:00
Daniel Lee
a9e2273064 Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-31 16:45:32 +01:00
Chris Rice
dba93d8240 Renamed "Period" to "Min period" in CloudWatch query editor (#10665) 2018-01-31 14:14:34 +01:00
Torkel Ödegaard
c1cdcd3bda docs: updated whatsnew 2018-01-31 09:41:49 +01:00
Marcus Efraimsson
7734df1d18 dashboards: fix links to recently viewed and starred dashboards 
Use new property url from dashboard search for linking to dashboards
#7883
 2018-01-31 00:48:36 +01:00
Patrick O'Carroll
2c8e448559 moved icon (#10681) 2018-01-30 20:01:12 +01:00
Daniel Lee
0fb05bcf59 Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-30 09:26:23 +01:00
Torkel Ödegaard
b1cf4cf01c fix: InfluxDB Query Editor and selecting template variable in where clause caused issue, fixes #10402, fixes #10663 2018-01-29 17:04:29 +01:00
Torkel Ödegaard
a0323e96fa fix: tweak of PR #10635 2018-01-29 10:46:05 +01:00
Torkel Ödegaard
dd4374cc65 Merge remote-tracking branch 'origin/10612_table-date-format' 2018-01-29 10:41:57 +01:00
Patrick O'Carroll
5f81f401e3 replaced input with gf-form-dropdown 2018-01-26 17:25:12 +01:00
Alexander Zobnin
e6c19eb8e9 graphite: fix nested alerting queries (#10633) 2018-01-26 15:05:05 +01:00
hannes
eefcb3080a fix typo in parameter. (#10613) 
* options.scopedVars was called without 'd', so a undefined was passed
  to the function convertDimensionFormat()
 2018-01-26 14:10:17 +01:00
Alexander Zobnin
b79017e4a4 graph: fix series sorting issue (#10617) 2018-01-26 09:23:56 +01:00
Daniel Lee
bc5fae5367 dashfolders: merge conflict 2018-01-25 14:54:50 +01:00
Jonathan McCall
579d2b63f8 Disable prefix and postfix font size when gauge mode is enabled (#10573) 
* Disable prefix and postfix font size when gauge mode is enabled

* Use function to hide prefix/postfix size when using gauge

* Rename disableFontSizes to canChangeFontSizes
 2018-01-25 09:27:25 +01:00
Torkel Ödegaard
dd70710617 refactor: minor css class naming change of #10505 2018-01-23 16:10:04 +01:00
Torkel Ödegaard
12b08b61d7 Merge remote-tracking branch 'origin/graphite-query-editor-enhancements' 2018-01-23 16:02:46 +01:00
Carl Bergquist
89ae4d6685
Merge pull request #9664 from mtanda/prometheus_on_by 
(prometheus) show label name in paren after by/without/on/ignoring/group_left/group_right
 2018-01-22 10:42:20 +01:00
Jonathan McCall
f516c82ddc Disable instead of hide mode options when line/points is unchecked 2018-01-20 19:23:26 -05:00
Andrew Cottrell
8368bfeab4
Recommend a limit on database query 
Users not putting a limit on can end up causing bad performance. A recommended limit in the placehold is a quick little help.
 2018-01-18 14:31:42 +00:00
Daniel Lee
1a019052d5 mysql: convert numbers to text for annotation tooltip 2018-01-18 11:50:16 +01:00
Dan Cech
c62b0858ae
move graphite /functions parsing into gfunc.ts 2018-01-16 18:04:59 -05:00
Dan Cech
315ecf8505
fix tests & some display issues 2018-01-16 17:02:03 -05:00
Torkel Ödegaard
e9d33750cb
fix: graphite func editor fixes, this component is messy and ugly as hell 2018-01-16 17:02:03 -05:00
Torkel Ödegaard
1a6bf692c6
fix: minor fixes 2018-01-16 17:02:03 -05:00
Torkel Ödegaard
7e750cef43
fix: query editor needs to wait for function definitions to load 2018-01-16 17:02:03 -05:00