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
1,400 Commits 5,454 Branches 554 Tags 1.9 GiB
3e24a87ead
Commit Graph

1400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
5087cd2b19 Fixes #225, grid min not sent to graphite png renderer when set to 0 2014-03-26 11:51:52 -07:00
Torkel Ödegaard
06e9256050 Closes #209, sub folder with project name and version suffix in release zip files 2014-03-26 11:51:52 -07:00
Torkel Ödegaard
8aff6f50db Fixes #223, float arguments to functions like scale should now work as expected 2014-03-26 11:51:52 -07:00
Torkel Ödegaard
b2aca66e2d aliasByNode support for second node param, Closes #167 2014-03-26 11:51:52 -07:00
Marco Vito Moscaritolo
add61cf783 Moved function definition out of template. 2014-03-26 11:51:52 -07:00
Marco Vito Moscaritolo
a549bd73f9 Added more query function in InfluxDB 2014-03-26 11:51:51 -07:00
Torkel Ödegaard
f849b8cd4b fixed build issues with last commit (spec file syntax error) 2014-03-26 11:51:51 -07:00
Torkel Ödegaard
d8cf427425 more work on filterSrv unit tests 2014-03-26 11:51:51 -07:00
Torkel Ödegaard
517ac3f111 added unit tests for filterSrv 2014-03-26 11:51:51 -07:00
Jaime Gago
43f1cfba5a Fix a "kibana" leftover in comments 2014-03-26 11:51:51 -07:00
Torkel Ödegaard
dd18b6c836 Adds support to have filters inside filters, (nested templated segments), Closes #128 2014-03-26 11:51:51 -07:00
Bruce Sherrod
d8b86a899d Merge remote-tracking branch 'remotes/torkelo/master' 2014-03-24 12:35:12 -07:00
Torkel Ödegaard
ed9e336c51 Fixes #225, grid min not sent to graphite png renderer when set to 0 2014-03-24 13:17:27 +01:00
Torkel Ödegaard
94fea502b9 Closes #209, sub folder with project name and version suffix in release zip files 2014-03-24 12:51:49 +01:00
Torkel Ödegaard
1e79e39161 Fixes #223, float arguments to functions like scale should now work as expected 2014-03-24 12:20:28 +01:00
Torkel Ödegaard
6f9c2211fa aliasByNode support for second node param, Closes #167 2014-03-24 09:57:03 +01:00
Torkel Ödegaard
2e1e7462dc Merge pull request #218 from mavimo/feature/influx-query-functions 
[InfluxDB] Added more query functions
 2014-03-23 16:08:34 -04:00
Marco Vito Moscaritolo
6fb36acc9a Moved function definition out of template. 2014-03-23 20:20:18 +01:00
Marco Vito Moscaritolo
f35baffbef Added more query function in InfluxDB 2014-03-23 18:52:56 +01:00
Torkel Ödegaard
69b9189220 fixed build issues with last commit (spec file syntax error) 2014-03-23 16:04:21 +01:00
Torkel Ödegaard
06fe572113 more work on filterSrv unit tests 2014-03-23 07:03:43 +01:00
Torkel Ödegaard
dfd1d09641 added unit tests for filterSrv 2014-03-23 07:03:43 +01:00
Bruce Sherrod
6d981afcbc Merge branch 'master' of github.com:bruce-lyft/grafana 2014-03-19 13:38:08 -07:00
Bruce Sherrod
f90db0ed50 make html-unsafe for text/html panels 2014-03-19 13:37:29 -07:00
Bruce Sherrod
9894023177 make html-unsafe for text/html panels 2014-03-19 13:36:52 -07:00
Torkel Ödegaard
5ac6d28abf Merge pull request #213 from jaimegago/master 
Fix a "kibana" leftover in comments
 2014-03-19 06:05:55 +01:00
Jaime Gago
b813f48a7e Fix a "kibana" leftover in comments 2014-03-18 17:53:57 -07:00
Torkel Ödegaard
a3b4e40982 Adds support to have filters inside filters, (nested templated segments), Closes #128 2014-03-18 21:08:51 +01:00
Torkel Ödegaard
0c42b9a68e Merge pull request #212 from andrewmichaelsmith/log_func 
Add logarithmic scale function
 2014-03-18 21:08:31 +01:00
Andy Smith
48d3317136 Add logarithmic scale function 2014-03-18 19:36:31 +00:00
Torkel Ödegaard
5a0fa8c09f added phantomjs karma test to run in travis 2014-03-18 20:04:04 +01:00
Torkel Ödegaard
0a6b393b35 fixed karama tests 2014-03-18 19:27:42 +01:00
Torkel Ödegaard
dadae53e51 Merge branch 'master' of github.com:torkelo/grafana 2014-03-17 17:25:21 +01:00
Torkel Ödegaard
c22c4b864c fixed string replace issue that caused problems, this removes build cache busting in requirejs, will need to fix that later 2014-03-17 17:24:38 +01:00
Torkel Ödegaard
aa27c13b20 Merge pull request #208 from fstern/master 
Added graphite functions: nPercentile and keepLastValue
 2014-03-17 11:31:06 +01:00
Bruno Renié
50771b0762 Workaround a behavior modification probably in grunt-string-replace 2014-03-16 20:50:15 +01:00
Torkel Ödegaard
336cf768d8 Merge pull request #194 from danharvey/add-hitcount-function 
Added hitcount Transform function.
 2014-03-12 09:57:47 +01:00
Dan Harvey
a76d9b87f0 Improved markdown formatting in the contributing page. 2014-03-12 08:23:28 +00:00
Dan Harvey
5794fc533f Added hitcount Transform function. 2014-03-11 18:43:55 +00:00
Torkel Ödegaard
9ebf769b4d Fixes #191, update graph after adding new function and not changing default value 2014-03-11 13:00:28 +01:00
Falk Stern
2ea21e1f96 Added nPercentile and keepLastValue 2014-03-11 12:06:30 +01:00
Torkel Ödegaard
b396563235 Merge pull request #185 from nikicat/master 
added graphite functions: percentileOfSeries, sumSeriesWithWildcards, averageSeriesWithWildcards
 2014-03-10 14:17:15 +01:00
Nikolay Bryskin
c5b992e330 added graphite functions: percentileOfSeries, sumSeriesWithWildcards, averageSeriesWithWildcards 2014-03-10 17:04:34 +04:00
Torkel Ödegaard
ec6fae9e65 Merge pull request #183 from merc1031/master 
round up maxDataPoints to nearest integer in request. graphite 0.9.x and...
 2014-03-10 11:11:24 +01:00
Leonidas Loucas
7f5c6ca18d round up maxDataPoints to nearest integer in request. graphite 0.9.x and 0.9.12 seem to treat decimal maxDataPoints badly returning enourmous amounts of data 2014-03-10 02:50:11 -07:00
Torkel Odegaard
9de60a9a7c updated readme and changelog 2014-03-09 19:12:02 +01:00
Torkel Odegaard
3f64f5a5fc updated readme and version bump 2014-03-09 18:02:04 +01:00
Torkel Ödegaard
7b036cbe3c Merge branch 'playlist' Closes #36 2014-03-08 16:27:26 +01:00
Torkel Ödegaard
5100834156 worked on favorites feature and dashboard playlist, #36 2014-03-08 16:27:01 +01:00
Torkel Ödegaard
a387d48b48 began work on dashboard playlist feature, #36 2014-03-07 19:24:45 +01:00