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
3,878 Commits 5,416 Branches 554 Tags
4a9949e643c84e89ede4cb4da49b17ade367413d
Commit Graph

311 Commits

Author SHA1 Message Date
Torkel Ödegaard
52c32d8b10 Merge branch 'issue1862' of https://github.com/raintank/grafana into raintank-issue1862 2015-04-29 09:31:21 +02:00
Anthony Woods
b72eba1ef2 refactor handling of refresh when urlValues being used for templates. fixes #1862 2015-04-29 14:55:39 +08:00
David Raifaizen
e5844afb0f Corrected missing annotations: true tag from the influxdb9 plugin json and fixed influxseries data handling 2015-04-28 16:29:32 -04:00
davidak
c4ac3d61b1 add gigabytes as unit 2015-04-28 20:53:29 +02:00
Torkel Ödegaard
8c14e565a7 Restored the variable color for the label/name in the submenu 2015-04-28 17:54:22 +02:00
Torkel Ödegaard
53cb0feda9 Various fixes, restored search auto focus 2015-04-28 17:28:34 +02:00
Torkel Ödegaard
14e8c15a3a Lots of new unit tests for unsaved changes service 2015-04-28 16:42:40 +02:00
Torkel Ödegaard
aaea80e053 A lot of refactoring opf unsaved changes service so it can be unit tested better 2015-04-28 13:45:59 +02:00
Torkel Ödegaard
f6a61c1ec5 Changes to unsaved changes service to ignore repeated panels and rows, #1888 2015-04-28 12:02:39 +02:00
Torkel Ödegaard
5768f10769 More optimizations and unit tests for panel repeats #1888 2015-04-28 10:23:35 +02:00
Torkel Ödegaard
bcb80eb38f more tweaks 2015-04-28 09:26:20 +02:00
Torkel Ödegaard
9590f485f1 More optimizations and unit tests for panel repeats, this time reuse rows, #1888 2015-04-28 09:24:07 +02:00
Torkel Ödegaard
32fe723da6 More optimizations and unit tests for panel repeats, #1888 2015-04-28 08:44:48 +02:00
Torkel Ödegaard
48b25bc327 Fix to graph panel, and width=0 bug 2015-04-28 06:40:23 +02:00
Torkel Ödegaard
3044a74a52 Optimization and unit tests for panel and row repeat feature, #1888 2015-04-27 18:37:39 +02:00
Torkel Ödegaard
ca7aa294e0 Began wriing unit test for new panel repeat features, #1888 2015-04-27 17:20:32 +02:00
Torkel Ödegaard
158b77d54e small update to panel repeats 2015-04-27 15:01:27 +02:00
Torkel Ödegaard
f8f302faad Merge branch 'panel_repeat' of github.com:grafana/grafana into panel_repeat 
Conflicts:
	public/app/partials/submenu.html
	public/css/less/submenu.less
	src/app/partials/roweditor.html
 2015-04-27 14:01:55 +02:00
Torkel Ödegaard
3f97bd8212 Added files removed in merge 2015-04-27 13:59:20 +02:00
Torkel Ödegaard
bf6f0f1a65 Merge branch 'master' into panel_repeat 
Conflicts:
	public/app/features/dashboard/dashboardCtrl.js
	public/app/partials/submenu.html
	public/css/less/submenu.less
	public/test/specs/templateSrv-specs.js
	src/app/partials/roweditor.html
 2015-04-27 13:53:02 +02:00
Torkel Ödegaard
8a986ec340 Using CTRL+S should not work when dashboardMeta.canSave is false, #1834 2015-04-27 10:59:14 +02:00
Torkel Ödegaard
b0ef659add Stop users from entering panel edit mode when dashboard editable is false, #1834 2015-04-27 10:56:36 +02:00
Torkel Ödegaard
29a7490af2 Small fix for unsaved changes when using save as feature 2015-04-27 10:29:04 +02:00
Torkel Ödegaard
ad45b63e79 Merge branch 'editable_false' of github.com:grafana/grafana into editable_false 2015-04-27 10:10:01 +02:00
Torkel Ödegaard
16fc6e8b42 More work on editable false dashboards, #1834 2015-04-27 10:09:32 +02:00
Torkel Ödegaard
af277f560f Merge branch 'master' into editable_false 2015-04-27 08:53:57 +02:00
Masaori Koshiba
df9403809b Fix conflict 2015-04-26 23:14:50 +09:00
Masaori Koshiba
d86814b6c5 Refactoring of tag suggestion 2015-04-26 23:02:40 +09:00
Torkel Ödegaard
87007994af Merge branch 'kairosdb-metric-text' of https://github.com/masaori335/grafana into kariosdb 2015-04-26 15:22:21 +02:00
Torkel Ödegaard
03e4afa736 Merge pull request #1882 from masaori335/kairosdb-appearance 
Fix query editor appearance of KairosDB Plugin
 2015-04-26 15:15:05 +02:00
Masaori Koshiba
7e044e29ba Change metric form input text 
Preparation of templated dashboard support.
 2015-04-26 19:31:04 +09:00
Masaori Koshiba
63ac6640e6 Merge branch 'master' into kairosdb-merge-master 2015-04-26 11:04:02 +09:00
Masaori Koshiba
5d57931060 Fix appearance of query editor 2015-04-26 00:24:04 +09:00
Torkel Ödegaard
a0cbca4cad more work on editable false, #1834 2015-04-25 11:10:28 +02:00
Masaori Koshiba
0a23a996bc Remove targetLetters 2015-04-25 16:12:10 +09:00
Torkel Ödegaard
bad2d1a974 Merge pull request #1869 from marknoe1/extra_uom 
Added units for voltage, current and frequency
 2015-04-24 15:55:53 +02:00
Torkel Ödegaard
fd274592d4 Merge branch 'master' into editable_false 2015-04-24 12:06:50 +02:00
Torkel Ödegaard
7064d87106 Firefox/IE issue, invisible text in dashboard search fixed, Fixes #1872 2015-04-24 11:20:09 +02:00
Mark Oellermann
f8ceb341d6 Added units for voltage, current and frequency 2015-04-24 13:23:54 +10:00
Anthony Woods
b6a4db3f8a always refresh varible options if refresh=true 2015-04-24 00:19:16 +08:00
Torkel Ödegaard
236c4e65f8 Began work on dashboard: editable flag, that actually stops users from changing anything, #1834 2015-04-23 15:26:48 +02:00
Torkel Ödegaard
2c52224013 /api/login/ping Fix for issue when behind reverse proxy and subpath, Fixes #1857 2015-04-23 08:24:30 +02:00
Torkel Ödegaard
1dfc576263 Panel timeshift: You can now use panel timeshift without a relative time override, Fixes #1848 2015-04-22 13:54:31 +02:00
Torkel Ödegaard
a11b180480 Snapshots: Fixed issue with snapshoting dashboards with an interval template variable, Fixes #1846 2015-04-22 12:27:12 +02:00
Torkel Ödegaard
dc88fff704 Migration: Import dashboards from Elasticsearch was capped at 100, now capped at 10000, Fixes #1843 2015-04-22 07:50:23 +02:00
Torkel Ödegaard
8ff316252e Update info text in grafana test data source, Fixes #1840 2015-04-21 21:17:32 +02:00
Torkel Ödegaard
dabdf1b7fd Graph Panel + Legend Table mode: Many series casued zero height graph, now legend will never reduce the height of the graph below 50% of row height, Fixes #1832 2015-04-21 18:46:44 +02:00
Torkel Odegaard
73b512859a Small ui align fix to graph axis and grid edit ui 2015-04-21 09:48:50 +02:00
carl bergquist
74c5015648 Change default values for linewidth and fill. 2015-04-21 09:27:15 +02:00
Masaori Koshiba
c762ad8db2 Refactoring KairosDB Plugin 2015-04-21 00:48:25 +09:00