Commit Graph

3599 Commits

Author SHA1 Message Date
Torkel Ödegaard 35cc0a1cc0 Rewriting anb abstracting how dashboards are loaded, unifying db, json files, and script dashboards, #960 2015-05-12 17:39:56 +02:00
Torkel Ödegaard b3be51f17f Lots of work on search and dashboard loading, trying to generalize concepts and code, #960 2015-05-12 14:11:30 +02:00
Torkel Ödegaard a40299b4dc Progress on json file index and search #960 2015-05-12 12:20:03 +02:00
Torkel Ödegaard 1a9f630710 Began work on adding json files to search, #960 2015-05-11 20:04:03 +02:00
Torkel Ödegaard 48ddd7213f Removed unused keybinding, ctrl+l, Fixes #1962 2015-05-11 10:03:34 +02:00
Torkel Ödegaard 582e680b12 Singlestat: threshold checks are now done on a rounded value, rounded to same number of decimals as is shown, Fixes #1983 2015-05-11 09:57:10 +02:00
Torkel Ödegaard a04a403539 Merge branch 'docs-2.0'
Conflicts:
	docs/sources/installation/configuration.md
	docs/sources/installation/docker.md
2015-05-11 08:02:28 +02:00
Torkel Ödegaard 564162442d Merge pull request #1982 from jamtur01/conflink
Fixed a series of installation doc issues
2015-05-11 07:57:10 +02:00
James Turnbull 7da3ee72c7 More docs fixes
1. Set paragraph size to 80 chars for better readability.
2. More formatting fixes.
3. More spelling and grammar fixes.
2015-05-10 16:52:40 -04:00
James Turnbull 823294f055 Fixed a series of installation doc issues
1. Fixed several spelling and grammar issues.
2. Fixed 404s for the Configuration page.
3. Fixed several Markdown formatting issues.
4. Tidy up of several pages.
2015-05-10 16:15:34 -04:00
Torkel Ödegaard 5aa495d0e4 Restored some previous grafana modifications to jquery flot 2015-05-09 19:47:21 +02:00
Torkel Ödegaard 2e6c2347eb Did some jquery flot performance tuning, added text size cache that reduced render times by 25% (for single serie graphs) 2015-05-09 19:31:00 +02:00
Torkel Ödegaard a256d71ef9 Merge pull request #1954 from jtyr/patch-1
Adding Ansible role for Grafana v2.x
2015-05-09 15:34:01 +02:00
Torkel Ödegaard b7a8551290 Merge pull request #1946 from DaveBlooman/theme_colour
Add Android 5 theme colour
2015-05-09 15:33:38 +02:00
Torkel Ödegaard 8f0269de76 Merge branch 'subsecond-influx' of https://github.com/abrander/grafana 2015-05-09 15:28:39 +02:00
Torkel Ödegaard 1a6e6f405d Merge branch 'master' of github.com:grafana/grafana 2015-05-09 15:28:23 +02:00
Torkel Ödegaard 59a2109cab Investigating some performance optimizations, added more perf instrumentation & measurements 2015-05-09 15:26:39 +02:00
Torkel Ödegaard 31781bc509 Fixed the link to the config page 2015-05-08 11:23:48 +02:00
Torkel Ödegaard db2161c7e6 Merge pull request #1967 from benheilman/detach_stderr_in_init_script
Detach stderr in rpm initscript
2015-05-08 11:19:14 +02:00
Torkel Ödegaard 7d4e676cfd Dashboard: Custom Navigation links & dynamic links to related dashboards, #1944 2015-05-08 11:04:46 +02:00
Torkel Ödegaard 2dcb98a8ed Merge branch 'master' of github.com:grafana/grafana 2015-05-08 11:03:25 +02:00
Torkel Ödegaard 0bde1bb857 Dashboard and nav links are near completion now, #1944 2015-05-08 10:56:54 +02:00
Anders Brander d685644dee Updated test to match e906a19 2015-05-07 22:48:44 +02:00
Anders Brander e906a1979c Allow kbn.secondsToHms() to return result in milliseconds. 2015-05-07 22:33:32 +02:00
Ben Heilman 0a9958c74e Detach stderr in rpm initscript 2015-05-07 14:47:27 -05:00
Torkel Ödegaard 04f9a6fdd0 Merge pull request #1963 from abrander/measurement-in-quotes
Quote 'measurement' properly in getAltSegments() (influxdb 0.9)
2015-05-07 20:29:34 +02:00
Anders Brander 5eee33a11f Quote 'measurement' properly in getAltSegments() to allow for dots in measurement identifier (Influxdb 0.9). 2015-05-07 19:51:55 +02:00
Torkel Ödegaard 4b4f398e83 more work on dashboard links, this feature is taking forever, dam angular, and dam complexity 2015-05-07 19:14:13 +02:00
Torkel Ödegaard 9655014041 More polish and refinements to dashboard links 2015-05-07 13:10:04 +02:00
Torkel Ödegaard 85e65e61d3 More work on dashboards links 2015-05-07 09:35:39 +02:00
Jiri Tyr e32259ccc9 Adding Ansible role for Grafana v2.x
Adding Ansible role which is compatible with Grafana v2.x.
2015-05-07 00:31:20 +01:00
Torkel Ödegaard 15137422a6 More work on dashboards links 2015-05-06 16:40:43 +02:00
Torkel Ödegaard 1f48c07395 more work on dash links 2015-05-06 10:57:32 +02:00
Torkel Ödegaard 26c9a19392 A lot of css style polish for submenu (template var selection, and new dashlinks) 2015-05-06 09:41:30 +02:00
Torkel Ödegaard 2c3aad785d Fix in unsaved changes service 2015-05-06 07:59:47 +02:00
Torkel Ödegaard ece9e8dcea Merge branch 'master' into dashlinks 2015-05-06 07:48:45 +02:00
DaveBlooman 85c45c2b8f Add Android 5 theme colour 2015-05-05 22:42:56 +01:00
Torkel Ödegaard 8149381f01 minor refactoring and markup fix 2015-05-05 20:59:21 +02:00
Torkel Ödegaard e221cbfbd6 Merge branch 'sidemenu_default_open' of https://github.com/raintank/grafana 2015-05-05 20:34:07 +02:00
Torkel Ödegaard 0c56ae4f32 more work on, #1944 2015-05-05 20:33:06 +02:00
Torkel Ödegaard 1e196fc091 Began work on dashboard links and nav feature, #1944 2015-05-05 19:56:49 +02:00
Torkel Ödegaard d4c0d5d81b changed position for checkbox label 2015-05-05 13:37:20 +02:00
Torkel Ödegaard 12c770f0ab markup update for templating editor 2015-05-05 13:33:57 +02:00
Torkel Ödegaard 637988b104 UI Polish, refactoring markup 2015-05-05 13:26:42 +02:00
Torkel Ödegaard 71edd9ff1b DashEditView: fix for small ui bug, when having dashboard settings view open and entering panel edit mode, did not cause dash edit view to be closed 2015-05-05 12:38:18 +02:00
Torkel Ödegaard 34539c0c13 Enforce domain, host header validation against domain setting, Refactoring of PR #1866, Closes #1732 2015-05-05 11:21:06 +02:00
Torkel Ödegaard 1f2cba81eb Merge branch 'enforce-domain' of https://github.com/gummiboll/grafana 2015-05-05 11:15:09 +02:00
Torkel Ödegaard e458ca7b47 Templating: updated template editor view & form 2015-05-05 10:56:39 +02:00
Anthony Woods b915bb98fb fix whitespace 2015-05-05 16:21:37 +08:00
Anthony Woods 8aef297e71 show sidemenu when admin user logs in the first time. #54 2015-05-05 10:43:19 +08:00