IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-09-05 04:40:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,400 Commits 892 Branches 731 Tags
e4e042e3899f2de88bb0f802cdec33cc82ebd0ea
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bergquist 22407fc897 fix(metrics): 64bit aligns standardcounter 
Due to a bug in golang the 64bit variable i
need to come first to be 64bit aligned.
https://golang.org/pkg/sync/atomic/#pkg-note-BUG

closes #5341
 2016-06-13 06:56:16 +02:00
Carl Bergquist dba6fe8af3 Merge pull request #5340 from hailthemelody/master 
update pricing to include 1 million free API requests per month
 2016-06-13 06:54:00 +02:00
bergquist ffac5c1299 docs(changelog): add note about changelog 2016-06-08 09:35:34 +02:00
Carl Bergquist fe5673134f Merge pull request #5292 from Thib17/master 
Enable the "limit" param in /api/search
 2016-06-08 09:19:58 +02:00
bergquist b76b42f209 docs(changelog): add note about deb post install script 2016-06-07 12:09:56 +02:00
Carl Bergquist ee88b0dc35 Merge pull request #5282 from nazco/patch-1 
restart grafana after upgrade
 2016-06-07 12:03:42 +02:00
bergquist b08f8bab71 Merge branch 'dakerfp-patch-3' 2016-06-03 15:09:18 +02:00
bergquist 961c31a747 test(util): add unit test for string util 2016-06-03 15:06:54 +02:00
bergquist d1a345bb03 Merge branch 'patch-3' of https://github.com/dakerfp/grafana into dakerfp-patch-3 2016-06-03 15:02:46 +02:00
Carl Bergquist 236aed112f Merge pull request #5255 from dakerfp/patch-1 
Unify signal registration in a single syscall.
 2016-06-03 14:59:42 +02:00
bergquist 3d7facf6ee fix(cli): fixes broken import 2016-06-03 13:40:48 +02:00
bergquist 6de1399cf0 fix(cli): fixes broken import 2016-06-03 12:35:17 +02:00
bergquist 15aeb4aec2 tech(cli): rename log to logger to separate from server logger 2016-06-03 12:22:30 +02:00
bergquist 510360a509 docs(elastic): updates readme 2016-06-02 14:56:31 +02:00
Carl Bergquist aa718b4dce Merge pull request #5253 from minkikim89/fix_seperate_typo 
fixed separate typo
 2016-06-02 07:42:04 +02:00
bergquist 65d8403a04 fix(metrics_reporting): adds missing formating varialbe 2016-06-01 15:16:17 +02:00
bergquist a8ac37f517 feat(usage_metrics): add timer metrics 2016-06-01 15:04:58 +02:00
bergquist b2c0679a7f feat(metrics): initial graphite metrics writer for internal stats 2016-06-01 13:31:11 +02:00
Carl Bergquist 8db00073b4 Merge pull request #5232 from peggyl/peggyl/fix-tags-popover-text 
Fix wording of the dashboard tags popover text
 2016-05-31 19:47:24 +02:00
Carl Bergquist 53ecb4c1ae Merge pull request #5222 from akiomik/patch-1 
Fixed assets urls in 500.html
 2016-05-31 07:59:24 +02:00
bergquist 2edb0ad94d feat(influxdb): adds spread functionallity 
closes #5211
 2016-05-30 14:23:24 +02:00
Carl Bergquist f8a535c6e8 Merge pull request #5195 from matschaffer/cloudwatch_metric_update_elasticbeanstalk 
Add metrics for AWS/ElasticBeanstalk
 2016-05-30 08:05:09 +02:00
Carl Bergquist f1bd614770 Merge pull request #5183 from nfnty/master 
package.json: Upgrade grunt-contrib-compress, Fixes #5071
 2016-05-30 08:02:00 +02:00
Carl Bergquist a6afd85526 Merge pull request #5197 from minkikim89/fixtypo 
Fixed type
 2016-05-27 16:57:07 +02:00
bergquist ec98b7d672 docs(changelog): add note about fix for 5167 2016-05-25 10:01:49 +02:00
bergquist 8c2b6b532d fix(preferences): fixes broken default home dashboard 
closes #5167
 2016-05-25 09:56:45 +02:00
bergquist 617d18e587 feat(panel): active tab is now placed in querystring aswell 2016-05-19 08:42:21 +02:00
bergquist 2b06ceda71 feat(panels): adds queryparameter for choose active tab in edit mode 2016-05-19 08:00:48 +02:00
bergquist 92ac370415 tech(docker): rename fake data writers 2016-05-18 12:29:37 +02:00
Carl Bergquist 5aaaeb05a0 Merge pull request #5075 from mtanda/prometheus_templating_fix 
(prometheus) fix metric find query
 2016-05-18 11:40:33 +02:00
Carl Bergquist 47f88346d2 Merge pull request #5058 from hijklmno/master 
Add dBm as an option in energy units
 2016-05-17 15:57:05 +02:00
bergquist b5fc12fb80 docs(opentsdb): add working image of add datasource for opentsdb 
closes #4984
 2016-05-17 15:32:33 +02:00
bergquist efe6fd154b tech(docker): add default writer for influxdb 2016-05-17 09:03:52 +02:00
bergquist fb8296524e tech(docker): add default fake-data-gen for prometheus 2016-05-17 09:03:52 +02:00
bergquist 0c345e2b09 docs(changelog): remove invalid chars 2016-05-16 09:06:39 +02:00
Carl Bergquist adce8c15bb Merge pull request #5041 from LindsayHill/patch-1 
Fixed minor typo s/seperate/separate/
 2016-05-15 22:25:15 +02:00
bergquist da68f7d31a feat(docker): fake data writer for opentsdb 2016-05-13 16:53:28 +02:00
bergquist 41ed0e670a feat(docker): fake data writer for graphite 2016-05-13 16:25:03 +02:00
bergquist 579b36754a Merge branch 'master' into development 2016-05-13 14:30:47 +02:00
bergquist e50211572f docs(changelog): add note about fix for graph panel 2016-05-13 13:54:39 +02:00
bergquist 6849bfae16 fix(graph): fixes broken hide xaxis option 
closes #5024
 2016-05-13 13:52:57 +02:00
bergquist c3f1d1a647 fix(influxdb): fixes extra semi colon due to hidden series 
closes #5005
 2016-05-13 13:36:57 +02:00
bergquist ac674bd405 docs(changelog): add note about graph fix 2016-05-13 12:23:58 +02:00
bergquist d5899aacfb fix(graph-panel): fixes broken PNG rendering 
When refactoring y-axies for graph panel these
was forgotten and which caused the graphite datasource
to send invalid data.

closes #5025
 2016-05-13 12:20:39 +02:00
bergquist 9e5a8c3fc8 docs(changelog): add info about configurable theme 2016-05-13 11:38:54 +02:00
Carl Bergquist 83707f7b35 Merge pull request #5011 from acmnu/default_theme 
Add new parameter to config: default_theme.
 2016-05-13 11:36:32 +02:00
bergquist 88b2f48493 Merge branch 'master' into development 2016-05-12 16:22:18 +02:00
Carl Bergquist e4a24e1785 Merge pull request #4969 from peggyl/peggyl/fix-update-checker-typo 
Fix typo in error message from update checker
 2016-05-10 18:17:09 +02:00
bergquist 5ee1b6ca97 docs(changelog): add note about merged PR 2016-05-10 12:54:25 +02:00
Carl Bergquist c522341136 Merge pull request #4944 from Gueust/optional_tooltip_ordering 
Add optional tooltip ordering (against the development branch)
 2016-05-10 12:51:44 +02:00
bergquist 2cebe151f2 Merge branch 'master' into development 2016-05-10 12:40:17 +02:00
Carl Bergquist 05ca7158d6 Merge pull request #4886 from Gueust/contribute_doc 
Add documentation on the build system for occasional contributors
 2016-05-06 15:04:14 +02:00
Carl Bergquist e30745f19c Merge pull request #4881 from mmckinst/kairosdb_broken_image 
fix broken link for kairosdb image
 2016-05-04 11:05:05 +02:00
bergquist 3d366c2a4c feat(graphs): align forms for line mode checkbox 2016-05-04 10:42:12 +02:00
Carl Bergquist 2018e30366 Merge pull request #4902 from idanz/patch-4 
Bring back threshold line mode
 2016-05-04 10:39:36 +02:00
bergquist 02ae1f79f7 docs(changelog): add node about range to text mappings in singlestat 2016-05-03 10:42:01 +02:00
bergquist de5a39f320 Revert "Revert "Merge branch 'utkarshcmu-rangeMaps'"" 
This reverts commit 58b91befde.
 2016-05-02 13:17:57 +02:00
bergquist 58b91befde Revert "Merge branch 'utkarshcmu-rangeMaps'" 
This reverts commit 8f976fd980, reversing
changes made to 072f51e300.
 2016-05-02 13:15:18 +02:00
bergquist 8f976fd980 Merge branch 'utkarshcmu-rangeMaps' 2016-05-02 13:10:17 +02:00
bergquist 91047ffa30 tech(singlestat): convert to gf-form 2016-05-02 12:43:07 +02:00
bergquist b42064acdb tech(singlestat): fixes indentation 2016-05-02 10:40:28 +02:00
bergquist 7e220b2b9e Merge branch 'rangeMaps' of https://github.com/utkarshcmu/grafana into utkarshcmu-rangeMaps 2016-05-02 10:26:30 +02:00
bergquist baac7809c5 docs(changelog): add notes about fixes for singlestat 2016-04-26 10:04:39 +02:00
bergquist 79ed99a940 fix(singlestat): fixes font size diffs for gauge 2016-04-26 10:00:13 +02:00
bergquist 9316bcf307 fix(singlestat): enables autoupdate on change 
closes #4809
closes #4812
 2016-04-26 09:51:31 +02:00
Carl Bergquist 31624b410a Merge pull request #4800 from 1tylermitchell/patch-1 
typo
 2016-04-25 08:01:39 +02:00
bergquist c0384a04f8 Merge branch 'cli_upgradeFix' 2016-04-23 14:40:05 +02:00
bergquist ee0c4cd194 docs(changelog): add note about cli issue 
closes #4651
 2016-04-23 14:39:42 +02:00
bergquist 07b13e24fa style(cli): add some color to error messages 2016-04-23 14:39:42 +02:00
bergquist 0855f51436 feat(cli): improves defer error handling 2016-04-23 14:39:42 +02:00
bergquist 70acfb2cfd fix(cli): adds better help text. 
The zip lib is throwing panics sometimes when the response is malformed.
The cli will now try to download the zip file up to three times before
aborting. The cli gives a better error message and informes the user
about retrying.

closes #4651
 2016-04-23 14:39:42 +02:00
Carl Bergquist be19f8888e Merge pull request #4792 from grafana/revert-4790-revert-3688-gauges 
Revert "Revert "Gauges""
 2016-04-22 15:06:13 +02:00
Carl Bergquist 453f8b312a Revert "Revert "Gauges"" 2016-04-22 14:55:35 +02:00
Carl Bergquist 1f9c2add7c Merge pull request #4790 from grafana/revert-3688-gauges 
Revert "Gauges"
 2016-04-22 13:05:54 +02:00
Carl Bergquist 24fbcd8dea Revert "Gauges" 2016-04-22 13:05:43 +02:00
bergquist db15bf23b8 fix(sass): fixes sass lint issue 2016-04-22 12:09:02 +02:00
bergquist de52ca4785 docs(changelog): adds gauges to changelog 2016-04-22 11:54:09 +02:00
Carl Bergquist 2748a3fbd8 Merge pull request #3688 from keis/gauges 
Gauges
 2016-04-22 11:49:35 +02:00
bergquist 0fb4141ce4 docs(changelog): add note about scrollbar fix #4769 2016-04-21 10:23:09 +02:00
bergquist 51de894692 fix(snapshots): sets default value for snapshot name 
make it possible for < 3.0 instances to publish snapshots

ref #4778
 2016-04-21 09:59:48 +02:00
Carl Bergquist 9f4ad73698 Merge pull request #4758 from bergquist/cli_local_pluginfolder 
CLI: Adds support for local plugin folder
 2016-04-19 17:30:01 +02:00
bergquist 0108b5eb88 fix(singlestat): adds support for lighttheme 2016-04-19 16:18:29 +02:00
bergquist 0c6841bdc7 fix(singlestat): adds support for fontsizes in gagues 2016-04-19 16:18:22 +02:00
bergquist ff22f43002 fix(cli): fixes missplaced % 2016-04-19 14:46:03 +02:00
bergquist 4e8396dbce fix(graph): sets legend table scroll to auto 
closes #4760
 2016-04-19 13:41:35 +02:00
bergquist d38d4efc18 style(cli): improve logging to find install crash 2016-04-19 10:39:55 +02:00
bergquist a8c68e33db feat(cli): add more logging for failed install 2016-04-19 10:22:02 +02:00
bergquist 903d1b7797 tech(cli): dont use defer statements in loops 2016-04-19 09:13:58 +02:00
bergquist 5abaf26b5f style(cli): remove some logging 2016-04-19 08:39:22 +02:00
bergquist 485a377800 fix(cli): adds support for local plugin folder 
closes #4572
 2016-04-19 08:27:26 +02:00
bergquist c148e54bbd style(influxdb): improve naming 2016-04-18 18:52:09 +02:00
bergquist 267ab822c2 tech(influxdb): uses hashmap for uniqueness 2016-04-18 18:46:50 +02:00
bergquist 80818f80a9 tech(grunt): add check for not including "only" in tests 2016-04-18 17:12:53 +02:00
bergquist fde6eee4f4 fix(influxdb): adds support for multi table values 
When quering for tag values without measurement
all tags and values should be shown

closes #4726
 2016-04-18 16:27:06 +02:00
bergquist 7e66d0bcc1 fix(): remove only usage in tests 2016-04-18 15:25:06 +02:00
bergquist 6b8921c8c5 Merge branch 'utkarshcmu-move' 2016-04-12 16:22:27 +02:00
bergquist 7d09579e3f feat(timepicker): adds arrows to move back and forth in current dashboard 
closes #119
 2016-04-12 16:21:29 +02:00
bergquist e5c9a24c33 Merge branch 'master' into utkarshcmu-move 2016-04-12 16:21:20 +02:00
bergquist 963001ba1a Merge branch 'move' of https://github.com/utkarshcmu/grafana into utkarshcmu-move 2016-04-12 15:22:38 +02:00
bergquist a5eda6a87b feat(cli): detects plugin folder for dev env 
closes #4572
 2016-04-11 22:32:46 +02:00