IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-28 18:01:40 -06:00
Code Issues Packages Projects Releases Wiki Activity
28,207 Commits 5,238 Branches 544 Tags 1.9 GiB
f760a48c95
Commit Graph

12671 Commits

Author SHA1 Message Date
Torkel Ödegaard
dbc64c21a7 Merge branch 'master' into panel_repeat 2015-04-29 18:03:26 +02:00
Torkel Ödegaard
294f7f1f0d Merge branch 'v2.0.x' 
Conflicts:
	conf/sample.ini
 2015-04-29 15:59:35 +02:00
Torkel Ödegaard
d10ce90936 Fixed XSS issue with file based dashboards, was really casued by an issue with alertSrv accepting html in message alerts 2015-04-29 15:50:47 +02:00
Torkel Ödegaard
fe0bf876d9 Style changes and polish to multi variable value selection, #1144 2015-04-29 15:34:14 +02:00
Torkel Ödegaard
c5be95e46c Began polish and tweaks of new template variable multi select dropdown 2015-04-29 14:23:29 +02:00
Torkel Ödegaard
b762f56aee Merge branch 'master' into panel_repeat 
Conflicts:
	public/app/features/templating/templateValuesSrv.js
 2015-04-29 13:59:15 +02:00
Torkel Ödegaard
a38da2f7c6 Merge pull request #1901 from davidak/master 
add gigabytes as unit
 2015-04-29 10:29:49 +02:00
Torkel Ödegaard
593f2e0851 Merge pull request #1903 from craftytrickster/influx09-annotation-bugfix 
Fixed Annotations with InfluxDb9 Datasources
 2015-04-29 10:29:29 +02:00
Torkel Ödegaard
0d3fbb8659 Added message alerts when login failed due to github team membership or email domain requirement, #1731, #1660 2015-04-29 10:08:01 +02:00
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
Mike Kobyakov
e395211654 Instead of hard-coding the OpenTsdb aggregators list, pull the supported 
aggregators from the datasource directly.
 2015-04-22 12:02:45 -07: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
Torkel Ödegaard
b286ed6bb8 Small UI polish to playlist creation view 2015-04-20 11:47:09 +02:00
Torkel Odegaard
bb7ee1c5a3 Panel title: switched from context-menu cursor to pointer, context-menu does not work on windows in chrome and firefox, but works on other platforms :( 2015-04-20 07:29:25 +02:00
Masaori Koshiba
cc9d2fc139 Suppress LOG in test 2015-04-20 00:51:43 +09:00
Masaori Koshiba
dbc07827cf Add a basic test of KairosDBDatasource 2015-04-19 23:47:29 +09:00
Masaori Koshiba
05c27d8340 Rename 'KairosDBTargetCtrl' to 'KairosDBQueryCtrl' 2015-04-19 21:52:04 +09:00
Masaori Koshiba
d57ffad5e1 Add a space between arguments 2015-04-19 21:43:18 +09:00
William Wei
76b517b361 allow graphite metrics name contain '~' 
when a metrics name contains '~', id does not impact graph display.
but you can not use grafana UI to edit metrics with realtime
graphite query.
 2015-04-17 15:51:26 +08:00
Torkel Ödegaard
a446286869 Fixed issue with unsaved changes srv being triggerd by starring / unstarring a dashboard, Fixes #1795 2015-04-16 17:21:03 +02:00
Torkel Ödegaard
649d40ed66 Data source proxy: Fixed issue with using data source proxy when grafana is behind nginx suburl, Fixes #1784 2015-04-15 15:13:52 +02:00
Torkel Ödegaard
d71b626114 Graph Panel: Legend in table mode now aligns, graph area is reduced depending on how many series, Fixes #1786, Fixes #1749 2015-04-15 14:53:20 +02:00
Torkel Ödegaard
6ba8854854 Readded link in top header, Fixes #1756 2015-04-15 12:17:31 +02:00
Torkel Ödegaard
53b1d6a5b2 Row editor: increased width of title field, Fixes #1755 2015-04-15 10:52:09 +02:00
Torkel Ödegaard
140f1307b4 Small fix to singlestat panel and unit selector 2015-04-14 17:13:39 +02:00
Torkel Ödegaard
2bb85d216e Fixed fixed decimal option bug, when fixed decimal value was set to zero, Fixes #1764 2015-04-13 09:05:42 +02:00
Torkel Ödegaard
32275cb009 Merge pull request #1760 from masaori335/kairosdb-cleanup 
Cleanup KairosDB Plugin
 2015-04-12 15:37:45 +02:00
Masaori Koshiba
88bf0cdb9e Fix styles around 'function' 2015-04-12 20:51:35 +09:00
Masaori Koshiba
a2b751976e Add space before and after binary operators 2015-04-12 20:41:09 +09:00
Masaori Koshiba
ddb4b928a0 Delete MetricListToObject which never used 2015-04-12 20:28:01 +09:00
Masaori Koshiba
2b5fa599fb Fix styles warned by jshint 2015-04-12 20:28:00 +09:00
Masaori Koshiba
ae2201ef6f Add space after keywords 2015-04-12 20:28:00 +09:00
Masaori Koshiba
ed69ddedbf Fix styles warned by jscs 2015-04-12 20:27:51 +09:00
Masaori Koshiba
66f5411402 Fix class names in query.editor.html of KairosDB Plugin 2015-04-12 18:39:41 +09:00
Torkel Ödegaard
cc14705404 Update changelog 2015-04-12 09:42:27 +02:00
Torkel Ödegaard
00cdb5e36a Merge pull request #1738 from mtanda/suppress_redrawing_by_tooltip 
Suppress redrawing when Shared Crosshair is disabled
 2015-04-10 17:44:39 +02:00
Torkel Ödegaard
437cd50039 Merge pull request #1740 from craftytrickster/master 
When performing a metric find query, the InfluxDb9 datasource needs a qu...
 2015-04-10 17:41:56 +02:00
Matt
40b2535728 Typo fix in help_modal.html 
Fixed typo in header (Keyboard shutcuts -. Keyboard shortcuts)
 2015-04-09 16:18:15 -04:00
David Raifaizen
2d016c5a3f When performing a metric find query, the InfluxDb9 datasource needs a query type in order to return results succesfully. This parameter is not available when called from the templateValuesSrv, which is causing an error 2015-04-09 12:05:18 -04:00
Mitsuhiro Tanda
ba3bb57926 suppress all graph redrawing when shared tooltip is enabled 2015-04-10 00:34:23 +09:00
Torkel Ödegaard
f28af4f369 OpenTSDB: another improvement to OpenTSDB query -> query result matching 2015-04-07 21:47:06 +02:00
Torkel Ödegaard
1bd238191c OpenTSDB: better matching for query -> query result series 2015-04-07 21:42:21 +02:00
Torkel Ödegaard
01c97e69dd Updated influxdb 0.9 datasource config view to mention incomplete state of data source 2015-04-07 13:56:35 +02:00
Torkel Ödegaard
646298f5c5 Handle errors when loading dashboard with template variables that query data sources that cannot be found 2015-04-07 13:48:26 +02:00
Torkel Ödegaard
8f73328e25 Fixed datasource proxy and session timeout issue for OpenTSDB, #1667 2015-04-07 09:53:59 +02:00
Torkel Ödegaard
b5112aeee2 Data source proxy, and session timeout fix for influxdb, #1667 2015-04-07 09:50:03 +02:00
Torkel Ödegaard
22adf0d06e Datasource proxy & session timeout fix (casued 401 Unauthorized error after a while), Fixes #1667 2015-04-07 09:25:00 +02:00
Torkel Ödegaard
382f7066d9 Fixed importing dashboards from graphite web issue 2015-04-06 14:46:06 +02:00
Torkel Ödegaard
7a95451288 Fixed graph tooltip lingering when changing dashboard using keyboard, Fixes #1700 2015-04-06 11:42:50 +02:00
Torkel Ödegaard
538ec7c0a0 Unsaved changes: Do not show for snapshots, scripted and file based dashboards, Fixes #1707 2015-04-06 11:22:35 +02:00
Torkel Ödegaard
ea800dd838 Added login to organization users table, Fixes #1683 2015-04-04 10:14:51 +02:00
Torkel Ödegaard
1e1a6df480 Playlist: fixed issue where dashboard title was not visible when playing playlist 2015-04-02 15:37:03 +02:00
Torkel Ödegaard
7aa1ab855e Row editor fix: fixed issue when opening row editor when dashboard settings view is opened, Fixes #1688 2015-04-02 10:05:33 +02:00
Torkel Ödegaard
776f15055a Fixed grafana version in dash settings footer, Fixes #1699 2015-04-02 09:50:57 +02:00
Torkel Ödegaard
b291b18a87 Unsaved changes improvements: ignore row collapse state, ignore graph legend sort order, Closes #1702 2015-04-02 09:44:16 +02:00
Torkel Ödegaard
e6492f7db9 Share modal: Override UI theme via URL param for Share link, rendered panel, or embedded panel, Closes #1701 2015-04-02 09:21:38 +02:00
Torkel Ödegaard
3b737999d6 Unsaved changes: Do not show for users with role , Fixes #1703 2015-04-02 08:08:22 +02:00
Torkel Ödegaard
4ca125da41 Delete snapshot fix: the action is now shows confirmation directly in the modal (not opening a new tab with api call as in beta1), Fixes #1682 2015-04-01 08:24:03 +02:00
Torkel Ödegaard
03e336ba9e Fixed minor issue doing snapshot from home (root) dashboard 2015-03-31 21:48:54 +02:00
Torkel Ödegaard
463c519954 Dashlist panel: added fresh panel when changing limit, Fixes #1677 2015-03-31 17:30:27 +02:00
Torkel Ödegaard
1d0a3660bd Fixed issue with updating default data source, it required page reload to take effect, should not be required, now fixed, Fixes #1671 2015-03-31 14:31:47 +02:00
Torkel Ödegaard
b83367063e Small improvement to dashboard loading error handling 2015-03-31 14:03:01 +02:00
Torkel Ödegaard
aa724fc11e Remove datasource names in panels from snapshots 2015-03-31 10:48:14 +02:00
Torkel Ödegaard
dc03ca8879 Opening search closes fullscreen edit or fullscreen view 2015-03-30 12:25:17 +02:00
Torkel Ödegaard
de51aeab7b updates to whats new doc, and building from source, also small fix for panel snapshot, single panelsnapshot should expand panel span to 12 2015-03-30 11:08:46 +02:00
Torkel Ödegaard
8e33c2c4d3 Mini work on InfluxDB 0.9 datasource, still needs a lot of work 2015-03-29 20:47:34 +02:00
Torkel Ödegaard
795cee13c8 KairosDB data source plugin is messy, needs a lot of clean up & refactoring, please help 2015-03-29 20:30:59 +02:00
Torkel Ödegaard
15188c4a88 Moved kairosdb data source to correct folder 2015-03-29 20:13:32 +02:00
Torkel Ödegaard
c42d09b267 Enabled snapshot sharing of single panels, enabled sharing of snapshot dashboards (but you cannot snapshot a snapshot 2015-03-29 15:01:27 +02:00
Torkel Ödegaard
0f791c9fa8 Refactoring of share modal 2015-03-29 14:30:03 +02:00
Torkel Ödegaard
ce99e7b294 Updated gitignore and added config.js 2015-03-29 13:41:01 +02:00
Torkel Ödegaard
b48b2ac656 Updated grunt tasks for the src -> public directory change 2015-03-29 13:06:53 +02:00
Torkel Ödegaard
fde11be279 Renamed src directory to public 2015-03-29 12:57:28 +02:00