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,493 Commits 5,454 Branches 554 Tags 1.9 GiB
574ecdb512
Commit Graph

1493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
574ecdb512 fixed column typehead, introduced in PR #500 2014-06-22 11:27:36 +02:00
Torkel Ödegaard
7848a35941 Merge pull request #524 from acedrew/master 
Added nginx config examples to docs.
 2014-06-21 22:07:04 +02:00
Andrew Rodgers
dfe0314ba0 Added nginx config examples for CORS headers, and CORS selective reflection 2014-06-21 16:17:45 +00:00
Andrew Rodgers
4618ef0cbf Merge branch 'docs-improvement' 
Added nginx config examples, including CORS header reflection.
 2014-06-21 16:11:53 +00:00
Andrew Rodgers
bb281649fc prepare for master branch after all sorts of git shenanigans 2014-06-21 16:11:36 +00:00
Torkel Ödegaard
012ffcf6f6 Bug in when using % sign in legends (aliases), fixed by removing url decoding of metric names (Fixes #506) 2014-06-21 17:27:57 +02:00
Torkel Ödegaard
bef61cf019 Ability to set y min/max for right y-axis (RR #519, Closes #360) 2014-06-21 17:18:24 +02:00
Andrew Rodgers
5ce6464461 Revert "added nginx conf examples for graphite CORS configuration" 
This reverts commit c37496f2b0.
 2014-06-20 03:01:13 +00:00
Andrew Rodgers
a0c3f99d80 Revert "updated nginx conf examples for graphite CORS configuration" 
This reverts commit be03f6adb6.
 2014-06-20 03:00:50 +00:00
Andrew Rodgers
f6ba577cf4 Revert "updated nginx conf examples for graphite CORS configuration" 
This reverts commit 9edaa407f2.
 2014-06-20 03:00:31 +00:00
Andrew Rodgers
6ef03b7c6c Revert "Revert "Added left and right min and max for y-axis"" 
This reverts commit 05303dab45.
 2014-06-20 02:59:52 +00:00
Andrew Rodgers
05303dab45 Revert "Added left and right min and max for y-axis" 
This reverts commit 8743ba2886.
 2014-06-20 02:54:34 +00:00
Andrew Rodgers
9edaa407f2 updated nginx conf examples for graphite CORS configuration 2014-06-20 02:44:45 +00:00
Andrew Rodgers
be03f6adb6 updated nginx conf examples for graphite CORS configuration 2014-06-20 02:42:18 +00:00
Andrew Rodgers
c37496f2b0 added nginx conf examples for graphite CORS configuration 2014-06-20 02:40:01 +00:00
Andrew Rodgers
8743ba2886 Added left and right min and max for y-axis 2014-06-19 21:49:49 +00:00
Torkel Ödegaard
2fbb87e17a fix jshint and updated changelog with PR #500 2014-06-17 18:09:10 +02:00
Pauly Myjavec
1eadf52f5e Fixes regex InfluxDB queries intoduced in 1.6.0 
Do not encapsulate regex with quotes in query string
Fix the way series names are displayed, do not use column name but
rather series names
 2014-06-17 22:38:52 +10:00
Torkel Ödegaard
810f46c450 updated karma dependencies in package.json 2014-06-16 12:40:41 +02:00
Torkel Ödegaard
393dfd1e96 changed version to 1.6.0 2014-06-16 12:24:04 +02:00
Torkel Ödegaard
011e95b331 Graphite query lexer change, can now handle regex parameters for aliasSub function (Fixes #126) 2014-06-16 08:14:34 +02:00
Torkel Ödegaard
da451d013a Refactoring and rewrite parts of influxdb group by feature from PR #441 2014-06-14 14:40:22 +02:00
Torkel Ödegaard
d18244a8a1 removed commented out sections of the opentsdb datasource 2014-06-14 11:53:16 +02:00
Torkel Ödegaard
6214872e0c Merge branch 'master' of github.com:grafana/grafana 2014-06-14 11:39:44 +02:00
Torkel Ödegaard
6885cea0fd Improvement and polish to the OpenTSDB query editor (Issue #492) 2014-06-14 11:38:27 +02:00
Torkel Ödegaard
77bfaa4245 fixed default dashboard json editable flag, accidentally set to to false 2014-06-11 08:07:18 +02:00
Torkel Ödegaard
e8c11251de fix for build step that replaces @grafanaVersion@ with correct version string 2014-06-09 16:59:53 +02:00
Torkel Ödegaard
87a8b1b3f5 small fix to config.sample.js 2014-06-09 13:33:30 +02:00
Torkel Ödegaard
c5d2590293 removed unused code 2014-06-08 13:00:59 +02:00
Torkel Ödegaard
92318d5804 small fix for click on row menu submenus 2014-06-07 09:05:30 +02:00
Torkel Ödegaard
191f9daf4d update changelog 2014-06-07 08:16:34 +02:00
Torkel Ödegaard
b67280f0d4 Merge pull request #476 from lyrixx/axis-s-week 
Format seconds metric by week if needed
 2014-06-07 07:06:53 +02:00
Torkel Ödegaard
ce8bdabab8 Adding JSCS (javascript style checker) 2014-06-07 07:05:42 +02:00
Grégoire Pineau
b40af07103 Format seconds metric by week if needed 2014-06-07 02:06:34 +02:00
Torkel Ödegaard
f3698cd625 Cleanup of config.sample.js, removed graphiteUrl setting, it will still work for next release 2014-06-06 23:33:33 +02:00
Clicky
c928618d1a Formatting. 2014-06-06 11:59:02 -07:00
Clicky
3cc83ced93 Merge branch 'master' into add-influx-group-by 
Conflicts:
	.gitignore
	src/app/partials/influxdb/editor.html
	src/app/services/influxdb/influxdbDatasource.js
 2014-06-06 11:52:02 -07:00
Torkel Ödegaard
0ad4f3b85e Row editing and adding new panel is now a lot quicker and easier with the new row menu (Issue #475) 2014-06-06 18:30:15 +02:00
Torkel Ödegaard
2d061ce45a changed default row height to 250px 2014-06-06 16:05:56 +02:00
Torkel Ödegaard
6e2348d2b1 renamed graphite panel to graph 2014-06-06 16:03:39 +02:00
Torkel Ödegaard
525c4d529e cleanup, removal of unused code 2014-06-06 15:51:49 +02:00
Torkel Ödegaard
ea84149c87 Fix for exclusive series toggling (hold down CTRL, SHIFT or META key) and left click a series for exclusive toggling 
CTRL does not work on MAC OSX but SHIFT or META should (depending on browser) (Closes #350, Fixes #472)
 2014-06-06 11:23:17 +02:00
Torkel Ödegaard
af1855601b Improvement to InfluxDB query editor and function/value column selection, more space efficient, Closes #473 2014-06-06 10:56:38 +02:00
Torkel Ödegaard
1409065005 Merge branch 'master' into mavimo-feature/influxdb-filters 2014-06-06 08:59:06 +02:00
Torkel Ödegaard
623019ee56 Merge branch 'master' of github.com:grafana/grafana 2014-06-06 08:58:24 +02:00
Torkel Ödegaard
740d477801 added a little padding for metric target editor rows, making tthem sligly heigher 2014-06-06 08:58:14 +02:00
Torkel Ödegaard
c2b8f21fd9 small changes to PR #327, Partial support for url encoded metric names when using graphite datasource 2014-06-05 20:50:14 -07:00
Torkel Ödegaard
442ed87cfa Merge branch 'urldecode' of github.com:axe-felix/grafana into axe-felix-urldecode 2014-06-05 20:17:11 -07:00
Torkel Ödegaard
c48b3ded2f Fix for graphite function selection menu that some times draws outside screen. It now displays upward (Fixes #293) 2014-06-03 19:07:59 -07:00
Torkel Ödegaard
5bed5b9870 Fixing PR for influxdb filters 2014-06-03 21:23:42 +02:00