public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,856 Commits 655 Branches 650 Tags
d95eabfeec00a2386a64db9461e119ff0c8ac4f6
Commit Graph
3255 Commits
Author SHA1 Message Date
Carl Bergquist 17492c091a Merge pull request #9752 from mtanda/cw_alias_fix 
[bug fix] (cloudwatch) fix default alias format
 2017-11-02 07:45:26 +01:00
Torkel Ödegaard 97cc454ded ux: minor changes 2017-11-01 14:23:46 +01:00
Carl Bergquist c783bdac39 Merge pull request #9753 from mtanda/cw_period 
(cloudwatch) add period alias
 2017-11-01 14:02:41 +01:00
Mitsuhiro Tanda 4a63d696ff fix default alias 2017-11-01 18:48:30 +09:00
Mitsuhiro Tanda ebcb8be19a add period alias 2017-11-01 18:47:21 +09:00
Torkel Ödegaard c3bd07f9b4 testdata: added manual entry mode to test data 2017-11-01 09:59:24 +01:00
Torkel Ödegaard 84b10df887 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-10-31 16:14:40 +01:00
Sven Klemm a503c1d39c change default sslmode for postgres to verify-full (#9736) 2017-10-31 13:55:32 +01:00
Bart Van Bos 1a8d05bbcb Correct help message of api_dataproxy_request_all_milliseconds 2017-10-30 12:50:57 +01:00
Daniel Lee 752453f204 dashboards: fix link to bulk edit 2017-10-29 20:20:51 +01:00
Sven Klemm 34da0711ab add __timeGroup macro for mysql (#9596) 
* add __timeGroup macro for mysql

* put example __timeGroup query in frontend help

* do __timeGroup interval parsing in go similar to mysql

* ignore whitespace around interval
 2017-10-27 11:26:25 +02:00
Torkel Ödegaard cae852a1a2 updated icons 2017-10-27 08:33:04 +02:00
Torkel Ödegaard 9605ab4475 Merge branch 'master' into develop 2017-10-26 15:59:50 +02:00
Daniel Lee 7f3293ce80 dashfolders: rough draft of bulk edit 2017-10-25 16:12:03 +02:00
Carl Bergquist c91a1e994b Merge pull request #9594 from bergquist/datasources_optimistic_concurrency 
datasources: change to optimistic concurrency
 2017-10-25 12:44:36 +02:00
bergquist d68bfaa8be datasource as cfg: typo 2017-10-25 12:21:06 +02:00
bergquist da6430ac01 datasource as cfg: explain why cmd.version can be higher 2017-10-25 09:39:27 +02:00
xjewer bddebf4c82 add a phantomjs execution status to log if errors happens, e.g. OOM killer kills it (#9644) 
fixes #9643
 2017-10-25 08:14:14 +02:00
Torkel Ödegaard a299118c92 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-10-24 20:29:53 +02:00
Daniel Lee f70fb7dbf3 dashboard: fix home dashboard getting started panel 2017-10-24 19:22:56 +02:00
bergquist dea631bedc tech: remove rabbitmq event publisher 
closes #9645
 2017-10-24 14:10:23 +02:00
bergquist 2f35759346 asscoiate comment with name 2017-10-24 13:40:38 +02:00
bergquist 9b6535cca1 alerting: only editors can pause rules 
closes #9640
 2017-10-24 11:01:08 +02:00
Torkel Ödegaard b44daaabf2 Merge branch 'master' into develop 2017-10-24 09:06:09 +02:00
stuart nelson 93ac6680ab update log15 (#9622) 
* Update log15 and go-isatty

* Update usage in pkg log
 2017-10-23 19:57:19 +02:00
Daniel Lee 7863a0417c plugins: fixes path issue on Windows 
When loading a plugin and setting the path, an extra backslash sneaks
when running on Windows. Fixes #9597
 2017-10-23 13:03:06 +02:00
Torkel Ödegaard 9cce5217d0 build: fixed gofmt issue and addd mock response feature 2017-10-23 09:57:28 +02:00
bergquist 139f077453 prometheus: enable gzip for /metrics endpoint 
closes #9464
 2017-10-23 09:35:46 +02:00
Torkel Ödegaard 1fd2270a93 build: split circle test shell scripts 2017-10-23 09:06:50 +02:00
bergquist 89923bf77a datasources: change to optimisic concurrency 
prerequisite for #9504
 2017-10-23 07:55:16 +02:00
Torkel Ödegaard fff0fa2aee Merge branch 'master' into develop 2017-10-22 11:51:14 +02:00
bergquist b3a8d93dca mysql: add usage stats for mysql 2017-10-19 10:30:54 +02:00
Sven Klemm b2d880c6de modify $__timeGroup macro so it can be used in select clause (#9527) 
* modify $__timeGroup macro so it can be used in select clause

* fix $__interval_ms for postgres datasource

* use $__timeGroup macro in documentation

* fix annotation template query
remove title since its no longer used and add tags instead

* change __timeFilter macro to work on postgresql < 8.1 and redshift
 2017-10-18 18:10:01 +02:00
Carl Bergquist 43f039859a Merge pull request #9573 from cjchand/master 
When Messasge field is set for an alert, map it to the output field i…
 2017-10-18 12:10:42 +02:00
Alexander Zobnin 74e90d01ec Fixes for annotations API (#9577) 
* annotations: throw error if no text specified and set default time to Now() if empty, #9571

* annotations: fix saving graphite event with empty string tags

* docs: add /api/annotations/graphite endpoint docs, #9571
 2017-10-18 10:13:02 +02:00
Torkel Ödegaard 6f71af449b ux: new fixes 2017-10-18 09:48:37 +02:00
Chris Chandler 204fe007b7 When Messasge field is set for an alert, map it to the output field in a Sensu check result. If Message is empty, send "Grafana Metric Condition Met" 2017-10-17 16:22:56 -05:00
Torkel Ödegaard d8230f8fa7 Merge branch 'master' into develop 2017-10-17 11:17:28 +02:00
krise3k 45a572ebd8 annotations: quote reserved fields (#9550) 2017-10-17 11:03:19 +02:00
Daniel Lee 5f6ab1e370 styleguide: fix link in index 2017-10-16 14:11:52 +02:00
Daniel Lee b866383ec0 api: fix for dashboard version history 2017-10-16 14:09:52 +02:00
Eric Dahl 888d608090 CloudWatch: Add ALB RequestCountPerTarget metric 
This commit adds the new ALB metric `RequestCountPerTarget` which was
released in July 2017.
 2017-10-14 21:50:23 -07:00
Torkel Ödegaard a3bd761b0c ux: testing out new icons 2017-10-14 21:17:16 +02:00
bergquist ec14fa58b5 alerting: add count_non_null reducer 
makes it possible to have a second condition requering
at least X points of data.
 2017-10-13 09:47:10 +02:00
Torkel Ödegaard 48c8e4d627 fix: various fixes for new grid 2017-10-12 17:38:49 +02:00
Torkel Ödegaard 88ceb19d96 Merge branch 'master' into develop 2017-10-12 16:32:44 +02:00
bergquist b5727949fd logging: dont use cli logger in http_server 2017-10-12 15:29:01 +02:00
bergquist 88f55b01d8 oauth: raise error if session state is missing 
ref #9476
 2017-10-12 15:25:27 +02:00
bergquist 0848ba2e9c oauth: provide more logging for failed oauth requests 2017-10-12 15:25:27 +02:00
Carl Bergquist b63725033e Merge pull request #9450 from utkarshcmu/kafka_alert 
Kafka alerting
 2017-10-12 12:11:13 +02:00