public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,781 Commits 655 Branches 650 Tags
6dfdcd7ca565d7cacafc4ec0ce69091cdc0d7374
Commit Graph
2075 Commits
Author SHA1 Message Date
Daniel Lee 6dfdcd7ca5 email: change default from name to Grafana 
Changes default from name in smtp settings
from Grafana Admin to Grafana.

Fix for integration test (which is skipped but that
did not work)
 2017-02-15 11:02:46 +01:00
Daniel Lee 5fca4c7304 Merge pull request #7569 from jacobbednarz/add-sender-name-to-email 
Updates mailer to include `from_name` value
 2017-02-15 10:32:06 +01:00
Jan Garaj 79cd48f64c Cloudwatch AWS/SES metrics (#7568) 2017-02-15 08:12:24 +01:00
Jacob Bednarz 796957c8c6 Update mailer tests to include FromName 2017-02-15 08:04:21 +11:00
Jacob Bednarz 66445faeb5 Format mailer From field to include name 
Updates the messafe `From` field to include the name and email of the
sender.
 2017-02-15 07:51:41 +11:00
Jacob Bednarz 90cbfacacf Add FromName to SmtpSettings struct 
Updates the `SmtpSettings` struct to include a value for setting the
name of the email sender.
 2017-02-15 07:45:28 +11:00
Jacob Bednarz 7dc6b69c8b s/smpt/SMTP 2017-02-15 07:43:59 +11:00
Jacob Bednarz c9d4654592 s/from_adress/from_address 2017-02-15 07:43:16 +11:00
Daniel Lee 193d468ed3 admin: adds paging to global user list 
Currently there is a limit of 1000 users in the global
user list. This change introduces paging so that an
admin can see all users and not just the first 1000.

Adds a new route to the api - /api/users/search that
returns a list of users and a total count. It takes
two parameters perpage and page that enable paging.

Fixes #7469
 2017-02-13 12:59:36 +01:00
Carl Bergquist 7f4f38e773 Merge pull request #7519 from huydx/master 
(feat) support datasource delete by name api
 2017-02-10 15:53:34 +01:00
huydx 143cbe921f (feat) support datasource delete by name api 2017-02-10 23:30:14 +09:00
huydx 28d93b574d (feat) support max connection setting for database configuration 2017-02-10 15:30:01 +01:00
Carl Bergquist 73d441450b Merge pull request #7516 from grafana/oauth-login-redirect 
redirect user to requested url after login via oauth
 2017-02-10 08:27:41 +01:00
bergquist 5dd961c0f5 settings: remove commented code 2017-02-10 07:39:26 +01:00
Dan Cech b22881c717 redirect user to requested url after login via oauth 2017-02-09 14:01:53 -05:00
bergquist c7febca447 mqe: fixes broken test for indexalias 2017-02-09 16:43:57 +01:00
bergquist aa7292fac6 mqe: adds support for wildcard and index aliases 2017-02-09 16:25:03 +01:00
Daniel Lee 2b2368b189 Merge pull request #7491 from grafana/sorting-datasources 
Sorting datasources with case insensitive order
 2017-02-08 12:01:31 +01:00
Daniel Lee fbc3c3dd32 api: removes import alias + some unused fields 2017-02-08 11:57:05 +01:00
bergquist 00549f393c style(hipchat): improves code style 2017-02-08 11:24:49 +01:00
Daniel Lee cbd1455c42 fix(api): case insensitive sort for datasources 
The data source list is case sensitive when sorted. This changes the
sort to be case insensitive. The test only tests the handler, not the
routing or database query.
 2017-02-07 22:15:52 +01:00
James Regovich 53942f7987 Adding HipChat Notifier 2017-02-07 10:50:49 -06:00
Carl Bergquist 7d205ae2b8 Merge pull request #7466 from hagen1778/prometheus-basicauth-query 
allow setting basic auth headers for prometheus datasource
 2017-02-07 11:18:17 +01:00
bergquist 9ece10ef24 style(dataproxy): simplify expression 2017-02-07 11:03:57 +01:00
bergquist b386920abb Merge branch 'prometheus_secure' of https://github.com/mtanda/grafana into mtanda-prometheus_secure 2017-02-07 11:01:02 +01:00
hagen1778 a1e835884b use configured Transport instead of defaultHttpTransport 2017-02-07 11:56:59 +02:00
r.khavronenko 25be602dce go fmt 2017-02-06 17:17:16 +02:00
bergquist 57d36b3d42 feat(alerting): transform labels into tags for prometheus tsdb 2017-02-06 15:25:15 +01:00
r.khavronenko 80b92335bb allow setting basic auth headers for prometheus datasource 2017-02-06 16:22:09 +02:00
Mitsuhiro Tanda 69566a23fc improve security of Prometheus datasource 2017-02-06 23:10:10 +09:00
bergquist 3827c0a69c tech(alerting): adds tags to alerting data model 2017-02-06 14:59:29 +01:00
bergquist c05bc0cb17 chore(vet): fixes invalid fmt.Sprintf format 2017-02-05 21:19:39 +01:00
lucapette 032ecad3b7 Fix typo 2017-02-03 12:10:22 +01:00
Carl Bergquist 4f5dc6104f Merge pull request #7417 from Erliz/patch-1 
Add image url to telegram alert notifier
 2017-01-31 15:13:21 +01:00
Kevin Bowling 0c46def1a0 Add an idiomatic plugin path for FreeBSD (#7410) 2017-01-31 14:54:53 +01:00
Stanislav Vetlovskiy 0e892e9f86 Add image url to telegram alert notifier 
If public image url of alert is exist add it to the telegram message
 2017-01-31 16:47:14 +03:00
Torkel Ödegaard fce2e341d2 mergefix(): fixed issue with master merge 2017-01-31 09:00:36 +01:00
Torkel Ödegaard 8a95c563bb Merge branch 'master' into websocket 2017-01-31 08:56:49 +01:00
Torkel Ödegaard c400b5cf63 Merge branch 'master' of github.com:grafana/grafana 2017-01-31 07:48:44 +01:00
Torkel Ödegaard 1a9aaa4138 feat(server side png rendering): added timezone parameter for server side rendering, refactoring PR #7264 2017-01-31 07:48:10 +01:00
Torkel Ödegaard 830491fa66 Merge branch 'time-offset-to-image' of https://github.com/ryu1-sakai/grafana into ryu1-sakai-time-offset-to-image 2017-01-31 06:28:54 +01:00
Pavlos Daoglou 3e741315b4 [3743] Adds support for user search based on login or email (#7334) 
* [3743] Adds support for user search based on login or email

* Use query parameter instead

* Use macaron Query() instead
 2017-01-31 06:25:55 +01:00
Stanislav Vetlovskiy bd4eadf69c #7383 Fix factory typo in telegram notifier (#7406) 2017-01-31 06:23:19 +01:00
Oleksandr Kushchenko edba465a75 add DeliveryStreamName dimension to AWS/Firehose Cloudwatch namespace (#7388) 2017-01-28 08:30:57 +01:00
bergquist 46e4a54a6e style: go fmt with simplify 2017-01-27 15:21:02 +01:00
Torkel Ödegaard 2f4da15264 fix(http api): throw validation error if missing property in call to /api/admin/users/123/permissions, #7365 2017-01-26 08:54:51 +01:00
Torkel Ödegaard 40d39f8a3e refactor(): renaming alerting hide ui option, #7318 2017-01-25 13:32:26 +01:00
Torkel Ödegaard fee4846429 Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui 2017-01-25 13:16:48 +01:00
smalik 9862c9ff40 feat(alerting): Show/hide alerting UI using configuration variable 
Use configuration variable "show_alerting_ui" to show/hide alerting UI
 2017-01-20 10:43:29 -05:00
bergquist f5d8a75381 tech(webhook): remove redundant if statement 2017-01-19 09:29:40 +01:00