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,329 Commits 5,454 Branches 554 Tags 1.9 GiB
c592db4024
Commit Graph

1329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Torkel Ödegaard
adfa341d6e Merge branch 'new_func_editor' 2014-03-07 15:07:11 +01:00
Torkel Ödegaard
0b03ca158b final touches to aliasByNode automatic stuff 2014-03-07 15:07:02 +01:00
Torkel Ödegaard
d9e6fcd730 move func left right, remove, and link to graphite docs works 2014-03-07 13:43:44 +01:00
Torkel Ödegaard
feb20243e5 added func controls 2014-03-07 13:14:41 +01:00
Torkel Ödegaard
e3e6f511e7 focus first input param after adding function 2014-03-07 09:42:07 +01:00
Torkel Ödegaard
293a2db369 func editor is almost done 2014-03-06 22:08:41 +01:00
Semir Patel
1c72e0c40c Support graphite identifiers with embedded colons. i.e. host:twiggy.servlet:home.method:GET.user:loggedin.50th 2014-03-06 11:37:33 -08:00
Torkel Ödegaard
3e6a4362ee Merge branch 'master' into new_func_editor 2014-03-05 18:57:26 +01:00
Torkel Ödegaard
3b327bab8f Fixes to maxDataPoints / resolution and time axis formats 2014-03-05 18:37:51 +01:00
Torkel Ödegaard
a50b594aac added changelog and contributing docs 2014-03-05 13:02:33 +01:00
Torkel Ödegaard
e186c9b8bc experimenting with new func editor 2014-03-05 12:46:27 +01:00
Torkel Ödegaard
a5502a3751 added typeahead to column for influxdb, #103 2014-03-05 12:43:58 +01:00
Torkel Ödegaard
bd0f694f6a small refactoring and jshint fix for datasourceFactory func 2014-03-04 22:01:25 +01:00
Torkel Ödegaard
c018b4bd6e fix for influxdb as default datasource, #103 2014-03-04 21:49:06 +01:00
Torkel Ödegaard
2be71c577c Closes #164, typeahead / autocomplete for adding graphite functions to a target expression 2014-03-04 18:50:47 +01:00
Torkel Ödegaard
238de4d8b4 Merge pull request #162 from nixfloyd/master 
Added currentAbove/Below, highestMax functions.
 2014-03-04 09:57:18 +01:00
Lucian Grosu
6664890381 Added currentAbove/Below, highestMax functions. 2014-03-04 09:40:15 +01:00
Torkel Ödegaard
5221db5aa6 restored influxdb listSeries function 2014-03-03 08:39:05 +01:00
Torkel Ödegaard
1e6d998a9c fixed path to influxdb editor, #103 2014-03-03 06:53:50 +01:00
Torkel Ödegaard
da62a5653a added typeahead / autocomplete to influxdb series name, #103 2014-03-02 18:24:15 +01:00
Torkel Ödegaard
125ff957f5 Merge branch 'influxdb' Issue #103, influxdb support ready for testing and feedback 2014-03-02 13:27:02 +01:00