IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,715 Commits 1,119 Branches 715 Tags
85c23eed387888b9024913626fb19bedaa025b44
Commit Graph
56 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Spencer Alger 231c68edd7 added a 1 minute timeout to require.js. 2013-10-28 10:58:37 -07:00
Spencer Alger 3048538ab1 fixed an issue with the interval walker, which was causing bad zero-filling 2013-09-25 14:25:28 -07:00
Spencer Alger 15375b8c38 changed the color of the counts on the better map to be more visible in dark mode 2013-09-25 10:10:24 -07:00
Spencer Alger 3b14e3e226 switched up the build process a bit more, so most of the build occurs in-place, meaning the src and dest options are the same. This allows us to simple copy everthing at once and not need to specify all the edge cases like I did previously in copy:everything_left_in_src 2013-09-20 13:48:28 -07:00
Spencer Alger d53f4fd276 fixed the path to the leaflet image directory 2013-09-20 11:14:45 -07:00
Spencer Alger 412cefed78 Cleaned up the Grunt config a bit, removed an unneeded dep 2013-09-19 10:17:42 -07:00
Spencer Alger c767ae6645 moved the aws config out of the general gruntfile setup, and into a task that is only run when needed. 2013-09-19 08:09:04 -07:00
Spencer Alger 6e728480bb Updated the changes to work with the new repo structure. 2013-09-17 11:04:23 -07:00
Spencer Alger f414400a5a merged master 2013-09-16 15:16:01 -07:00
Spencer Alger 259562136f - Removed the "dist" directory 
- Created a grunt task to build, compress, and upload the build to s3
 - Updated the README to point users to downloads.elasticsearch.org
 2013-09-16 15:14:20 -07:00
Spencer Alger ff50e6e753 Fixed the loading of the dashboard scripts, feeding them the needed args and fixing the path that they are fetch from. 2013-09-16 11:09:29 -07:00
Spencer Alger f2d87ad5a4 Merge branch 'master' into build-tweaks 
Conflicts:
	dist/app/components/require.config.js
	src/app/components/require.config.js
 2013-09-15 12:45:27 -07:00
Spencer Alger 7b28483102 Fixed path to extend-jquery.js in require config 2013-09-15 07:12:42 -07:00
Spencer Alger a0bd73f27c Previous fix did not work when jQuery was inlined into app.js because RequireJS was under the impression that it had already init-ed jQuery and didn't call the init function. This new strategy just allows jQuery to be jQuery and has app.js include the extensions (components/extend-jquery.js) before the app boots. 2013-09-14 17:59:09 -07:00
Spencer Alger 2a1c67ffdb Somehow missed that tooltips were broken, caused by jquery defining itself using the 'jquery' name, which prevented our custom module from being included and extending jquery. 2013-09-14 17:21:25 -07:00
Spencer Alger ab93bcecb2 Added a cache busting config option to RequireJS that will add the latest commit sha to urls (only in dist build). 2013-09-13 19:14:14 -07:00
Spencer Alger 6c07338782 - Moved the config.js file into the root of the src and dist. 
- prevented the config file from being minified.
 - offloaded the js minification to a dedicated uglify task, which accepts more options than the require-js wrapper does.
 - Addded the banner to the top of the minified files.
 2013-09-13 16:02:08 -07:00
Spencer Alger 861d74ce0d removed the patch logs 2013-09-13 13:57:26 -07:00
Spencer Alger 5d9cb85ccf Merged Pull Request #484 2013-09-13 13:52:13 -07:00
Spencer Alger d72c72b3df fixing indent issue 2013-09-10 23:25:09 -07:00
Spencer Alger c9eccf99c8 added logic to the micropanel filters in the table panel to handle undefined values better 2013-08-30 16:41:59 -07:00
Spencer Alger 2431e40145 Added a checkbox to the tooltip's settings that will cause the query to be displayed in the case an alias is not set. 2013-08-30 15:33:22 -07:00
Spencer Alger 73253bb54d added a tooltip settings section to the histogram settings editor. Currently the only setting defines which value is displayed on stacked charts. 2013-08-30 14:11:28 -07:00
Spencer Alger fa2adfc97c Added a check, when rendering the delete button, to see if there are pinned 
queries, rather than just checking for other unpinned queries.
 2013-08-30 08:58:26 -07:00
Spencer Alger 29740110c8 Reverted to the previous "dot only" style of labeling the query a tooltip was referencing 
when the query is not aliased.
 2013-08-29 15:23:40 -07:00
Spencer Alger 6227cfdb70 moved the query color to a header, with a similarly colored title for the series 2013-08-29 15:05:07 -07:00
Spencer Alger eb0ee1cdc8 Zero-filling will now happen any time there is more than one query being plotted, even if that there is only one data point 
in the series.
 2013-08-28 14:10:06 -07:00
Spencer Alger 2846297dd9 moved the adition of the start and end time of the series after the reduce function checks each data point from elastic search. This whould resolve #422 2013-08-28 14:10:06 -07:00
Spencer Alger 6324f9042e switched out the border-radius powered query_color_dot's with font-awesome icons to maintain IE compatibility 2013-08-28 12:14:09 -07:00
Spencer Alger 7f745428fe centralized the tooltip creation and placement logic, and configured it to move out of the way when it would otherwise render off screen 2013-08-28 11:13:59 -07:00
Spencer Alger b160700e68 adjusted the shared kbn.top_field_values() function to preserve field values, specifically so that arrays are not flattened to strings 2013-08-27 15:04:01 -07:00
Spencer Alger a6c425ef97 emergency fix for the abundance of jshint errors -- sorry y'all 2013-08-26 18:05:03 -07:00
Spencer Alger 389f8aef4d white-space cleanse, and added forin flags to a couple files that need to be looked at at a later date. 2013-08-26 17:56:40 -07:00
spenceralger 74a526daaf Merge pull request #401 from spenceralger/shared-config 
Setup a shared JSHint config file
 2013-08-26 17:45:15 -07:00
Spencer Alger d778873ba5 Moved JSHint config into the standard .jshintrc file, so that it can be shared with the command line version as well as version that run within IDEs 2013-08-26 17:44:02 -07:00
Spencer Alger 1989a30735 Merge branch 'master' into geo_point_filter 2013-08-26 17:15:05 -07:00
spenceralger 6c4f00ced8 Merge pull request #420 from spenceralger/zero-filled-ts 
Restored the "required_times" functionality
 2013-08-26 16:51:11 -07:00
Spencer Alger b4a2391b8c Merge branch 'master' into geo_point_filter 2013-08-26 16:47:31 -07:00
Spencer Alger 7252800c53 Restored the "required_times" functionality so that stacking will work as expected. 2013-08-26 16:25:20 -07:00
Spencer Alger 0ab6e73f06 fixed a property typo 2013-08-26 13:46:33 -07:00
Spencer Alger 1b87ce387d cleaned up the documentation a bit 2013-08-26 13:46:33 -07:00
Spencer Alger d891d00fa4 Restored the "fill all the holes" strategy to the ZeroFill class, and introduced the fill_style option ("minimal" and 
"all" are possible values). Also allowed a set of required times to be specified when asking the times series for it's
data. This way, we can ensure in the stacked bar chart that each data point in use has a value preventing the bars
from stacking incorrectly.
 2013-08-26 13:46:33 -07:00
Spencer Alger 0a4f6d0dad added check for 404 response from the index_save call, assumes that auto_create_index is disabled and attempts to create the index before saving a second time 2013-08-26 13:46:33 -07:00
Spencer Alger 136bf66d39 Rebased to master to include latest changes 
updated the getFlotPairs() function to only check before and after a value, adding only enough zeros to maintain line graphs.
 2013-08-26 13:46:33 -07:00
Spencer Alger e858d3cb62 moved the timeSeries service into the histogram module. 2013-08-26 13:46:32 -07:00
Spencer Alger 1274a718dc created timeSeries service with a ZeroFilled class to manage the rows for the histogram 2013-08-26 13:45:31 -07:00
Spencer Alger 556925f840 added check for 404 response from the index_save call, assumes that auto_create_index is disabled and attempts to create the index before saving a second time 2013-08-26 09:22:32 -07:00
Spencer Alger 252b2fd651 fixed a property typo 2013-08-24 14:24:54 -07:00
Spencer Alger 9b62617ede cleaned up the documentation a bit 2013-08-23 14:36:10 -07:00
Spencer Alger 85f241a4d8 Restored the "fill all the holes" strategy to the ZeroFill class, and introduced the fill_style option ("minimal" and 
"all" are possible values). Also allowed a set of required times to be specified when asking the times series for it's
data. This way, we can ensure in the stacked bar chart that each data point in use has a value preventing the bars
from stacking incorrectly.
 2013-08-23 13:20:31 -07:00
Spencer Alger a01dd003fa Rebased to master to include latest changes 
updated the getFlotPairs() function to only check before and after a value, adding only enough zeros to maintain line graphs.
 2013-08-23 10:04:44 -07:00
spenceralger 2cff988ba0 Merge pull request #400 from spenceralger/master 
Creates zero-filled data for the histogram.
 2013-08-22 15:04:09 -07:00
Spencer Alger 69ab6bbd12 Merge branch 'zero-filled-ts' 
Conflicts:
	js/services.js
 2013-08-22 14:59:59 -07:00
Spencer Alger c8638e0581 moved the timeSeries service into the histogram module. 2013-08-22 14:58:10 -07:00
Spencer Alger 13d3da048d created timeSeries service with a ZeroFilled class to manage the rows for the histogram 2013-08-22 13:53:31 -07:00
Spencer Alger 8a9661bf26 Added a time series service, which provides a ZeroFilled class, setup the histogram to use it so that zero measurements will be displayed 2013-08-22 13:51:15 -07:00