public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,083 Commits 655 Branches 650 Tags
0392fde34edc22e660cdae33474d4ac9dcafe40c
Commit Graph
8083 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard a39e484aaa Merge pull request #2007 from anryko/master 
Update latest.json
 2015-05-20 09:04:06 +02:00
Torkel Ödegaard 51af06edf7 Merge pull request #2022 from dalmatinerdb/proxy-url-fix 
fixing #2021
 2015-05-20 09:03:23 +02:00
Heinz N. Gies 7cf9046dc5 fixing #2021 
This tiny commit fixes a routing problem for proxy requests. The
router was expecting a url path behind the proxy id, if none was
given (read: the service proxied was at the root of a host) then
the router would return a 404. With this patch it now propperly
uses ProxyDataSourceRequest.
 2015-05-19 23:49:30 +02:00
Torkel Ödegaard 25c6b64fed Began working on exploring variable value groups/tags 2015-05-19 16:54:08 +02:00
Torkel Ödegaard a8aab0cb2b Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014 2015-05-19 11:47:14 +02:00
Torkel Ödegaard 788e7fd36d Lots of api refactoring for org routes, #2014 2015-05-19 10:16:32 +02:00
Torkel Ödegaard 74bf1f23fb Small progress on #2014 2015-05-19 09:09:21 +02:00
Torkel Ödegaard bf9e51928d Fix to signed in user when user <-> org link is gone 2015-05-19 09:02:37 +02:00
Torkel Ödegaard bfe6d5434e Fixed placeholder text in templating editor 2015-05-19 08:46:45 +02:00
Torkel Ödegaard f81bde5643 Refactoring some api handlers to use the new Response return object 2015-05-18 21:23:40 +02:00
Torkel Ödegaard fbc6bb2112 More refactoring of user http api, trying to reuse handlers for sign in user and admin operations 2015-05-18 19:06:19 +02:00
Torkel Ödegaard 62e8841e8c Fixed spelling of Peta unit Quadr 2015-05-18 17:54:12 +02:00
Torkel Ödegaard 5270c4bc74 refactorin api code for user routes, preparation for admin improvements, #2014 2015-05-18 17:52:23 +02:00
Torkel Ödegaard a993bc1331 Merge pull request #2012 from Dieterbe/publish-no-recurse 
no unbound recursion in publish()
 2015-05-18 16:16:08 +02:00
Dieter Plaetinck e9f38b9fc0 no unbound recursion in publish() 
unbound recursion approach can blow up call stack,
and - I think - allocate memory unboundedly as well.

We can simply loop until err != nil

I didn't actually test this live, though tests succeed
 2015-05-18 10:04:01 -04:00
Torkel Ödegaard 5896903bd3 Began work on alias support and alias patterns for InfluxDB 0.9, #1525 2015-05-18 15:01:05 +02:00
Torkel Ödegaard f41c314329 Minor layout fix to templating editor, making input fields a little less wide 2015-05-18 11:47:12 +02:00
Torkel Ödegaard 84618a6076 Style and layout changes for InfluxDB 0.9 editor #1525 2015-05-18 11:40:50 +02:00
Torkel Ödegaard b61f30de94 Lots of progress on InfluxDB Query Editor, show tag keys, values and measurement dropdowns now take into account already selected tags or measurements, so you can start with tag keys and the select measurement, #1525 2015-05-18 10:49:45 +02:00
Torkel Ödegaard afe76ba260 Merge pull request #2009 from fffw/patch-1 
fix mac.md for incorrect href
 2015-05-18 09:10:04 +02:00
fffw 1302630abe fix mac.md for incorrect href 2015-05-18 14:47:00 +08:00
anryko a6d993ecdc Update latest.json 2015-05-17 18:12:20 +02:00
Torkel Ödegaard 65796d7477 Merge pull request #2005 from masaori335/kairosdb-template 
Templated dashboards support in KairosDB Plugin
 2015-05-17 15:56:52 +02:00
Masaori Koshiba 41a73a7adb Expand variables in KairosDB Plugin 2015-05-17 21:46:14 +09:00
Torkel Ödegaard 05d725d0b8 Slight refactoring, #1525 2015-05-16 22:37:08 +02:00
Torkel Ödegaard 7a41ecb63f Minor work on InfluxDB 0.9 query editor, #1525, hit a roadblock with the new InfluxDB query language, does not support tag and tag values discovery queries with filters, not sure if I need to move to SHOW SERIES style queries 2015-05-16 22:37:08 +02:00
Torkel Ödegaard 6fd37779b8 More work on new influxdb query editor, #1525 2015-05-16 22:37:08 +02:00
Torkel Ödegaard d14b570d76 Merge pull request #2003 from tmonk42/redact_provider_config 
Addresses #1853, redact session provider secrets
 2015-05-16 06:44:29 +02:00
Haneysmith, Nathan 2af28b90c2 whitespace update per gofmt 2015-05-15 13:25:41 -07:00
Haneysmith, Nathan 09b0e6e388 Addresses #1853, redact session provider secrets 
In cases where a database is used for session storage, redact the
session_provider config value. I assumed "@" as the marker for a
database vs file/memory.
 2015-05-15 11:11:02 -07:00
Torkel Ödegaard 5ca8d590bd Working on new query editor for influxdb 0.9, looking good! #1525 2015-05-15 15:58:07 +02:00
Torkel Ödegaard 11c8e80ea9 Working on new query editor for influxdb 0.9, #1525 2015-05-15 11:38:37 +02:00
Torkel Ödegaard ea993b6404 Some inital ldap work 2015-05-15 09:37:16 +02:00
Torkel Ödegaard a258e2e608 Added log base 2 graph y axis scale 2015-05-14 17:39:31 +02:00
Torkel Ödegaard e69bacaee1 Merge branch 'color_by_regex' 2015-05-14 12:34:37 +02:00
Torkel Ödegaard 8c0e1060e6 Graph: Define series color using regex rule, Closes #590 2015-05-14 12:34:30 +02:00
Torkel Ödegaard fb56bc59f2 Create pid file before runtime init, Fixes #1990 2015-05-14 10:33:56 +02:00
Torkel Ödegaard 1c9993f185 Backend configuration: When unknown key was detected the log error was not visible in log file due to logging was initialized after user config file is loaded, logging is now initialized twice, once based on defaults and command line arguments, then then again after user config file, Fixes #1992 2015-05-14 10:15:46 +02:00
Torkel Ödegaard 2dac975805 began work on color by regex / series override for color, #590 2015-05-13 21:34:50 +02:00
Torkel Ödegaard 2bb63835b6 Merge pull request #1991 from jeffbmartinez/fixGrammarInDocs 
Fix minor grammar issue in docs index page
 2015-05-13 19:30:29 +02:00
jeff martinez bfafb83604 Fix minor grammar issue in docs index page 2015-05-13 09:58:58 -07:00
Torkel Ödegaard ea54f6923b Added graphite function changed, closes #1961 2015-05-13 16:32:33 +02:00
Torkel Ödegaard 1a401780ba Updated changelog with completed story, JSON dashboards added to search, Closes #960 2015-05-13 14:01:48 +02:00
Torkel Ödegaard 448a8b8d1c Major refactorings around searching, moved to seperate package, trying to move stuff out of models package, extend search support searching different types of entities and different types of dashboards, #960 2015-05-13 13:36:24 +02:00
Torkel Ödegaard c8146e759f Fixed json index unit test 2015-05-13 10:57:18 +02:00
Torkel Ödegaard bb7d79e6d2 Refactoring search to support more than just db dashboards 2015-05-13 10:45:53 +02:00
Torkel Ödegaard fb35f7210c Fixed failing golang test 2015-05-13 10:06:06 +02:00
Torkel Ödegaard 187834b17c Trying to get dashboard loading and dashboard meta flags like canSave, canStar more managable 2015-05-13 09:58:45 +02:00
Torkel Ödegaard 4822d02787 Things are starting to work again 2015-05-12 19:24:11 +02:00
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