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
10,554 Commits 5,416 Branches 554 Tags
2097ed0bb8a79390b3088e521b333e01617bab4e
Commit Graph

2278 Commits

Author SHA1 Message Date
Seuf
319b8d8fca Configurable signout menu activation (#7968) 2017-03-29 11:33:28 +02:00
Dan Cech
24d4e50343 utf8mb4 encoding (#7959) 
* use utf8mb4 character set for connections to mysql

* use utf8mb4 character set for tables, shorten varchar fields used in unique indexes

* migration type to update table character set

* update table character sets

* set charset for temp_user.status

* gofmt
 2017-03-28 14:34:53 +02:00
Jaroslav Hanslík
e91a078105 Slack notification should contain fallback text (#7961) 2017-03-28 10:05:44 +02:00
Dan Cech
dde8583db8 xorm engine.SetMaxConns is a deprecated alias for engine.SetMaxOpenConns 2017-03-27 18:04:03 -04:00
Daniel Lee
f45d637025 auth: fix warning in test 2017-03-23 15:52:08 +01:00
Daniel Lee
beb85f413a oauth: delete session key instead of set to empty 
Adds the Delete function to the Session wrapper so that the Macaron
function for deleting keys from a Session can be used.

https://go-macaron.com/docs/middlewares/session#implement-provider-interface
 2017-03-23 15:26:13 +01:00
Daniel Lee
79cef75fed Merge pull request #7426 from Altoros/altoros/authorization-errors 
Add common type for oauth authorization errors
 2017-03-23 15:25:35 +01:00
gomlgs
e99137598e Cloudwatch: Correctly obtain IAM roles within ECS container tasks. (#7892) 
We now obtain credentials based on the container task's role
rather than just relying on the credentials of the enclosing
container instance.

Fixes #6700.
 2017-03-22 07:15:19 +01:00
Daniel Lee
69bec98962 chore: update all grafana.org urls to .com 2017-03-21 15:37:55 +01:00
Torkel Ödegaard
be5c4f47a6 s3: support for alternative s3 bucket url syntax, closes #7871 2017-03-20 14:10:44 +01:00
Torkel Ödegaard
970619ed52 Merge branch 'disable-login' 2017-03-20 11:18:41 +01:00
Torkel Ödegaard
4d4e165be7 links: updated links from grafana.net to grafana.com 2017-03-20 10:20:32 +01:00
Mitsuhiro Tanda
a67497e679 add new s3 metrics (#7846) 2017-03-20 09:09:08 +01:00
Dan Cech
737c29ec8c disable inviting new users to orgs if login form is disabled 2017-03-17 16:35:05 -04:00
Pandurang Waghulde
f3cce7efc9 typo fix for OpsGenie 2017-03-17 12:57:52 +05:30
Daniel Lee
9efb6e76e9 users: adds search and pagination (#7753) 
ref #7469. Follow up change that adds proper paging with 50 results
per page as well as a search box to search by name, login or email.
 2017-03-07 16:03:54 +01:00
Wouter Smit
125ee865b6 Spelling mistake (#7739) 2017-03-06 21:08:45 +01:00
Mitsuhiro Tanda
b387a8759e use session.NewSession() (#7745) 2017-03-06 21:08:16 +01:00
Pranay Kanwar
6ab90425c4 Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified (#7743) 2017-03-06 16:19:37 +01:00
Torkel Ödegaard
c3202d3f99 sessions: start session gc at startup but only after between 10 - 180 seconds 2017-03-06 12:23:28 +01:00
Torkel Ödegaard
9f1c6a73f0 tech: added sql logger to log all sql statements sent to sql server 2017-03-06 11:51:35 +01:00
Carl Bergquist
f185c2c953 Merge pull request #7676 from dbrgn/threema-emoji 
feat(alerting): Add emoji to Threema alert notifications
 2017-03-03 11:04:49 +01:00
bergquist
412b8998a8 webhooks: get proxy settings from ini file 
closes #7710
 2017-03-02 13:57:28 +01:00
Danilo Bargen
1422655e97 feat(alerting): Add emoji to Threema alert notifications 
This commit prepends emoji to Threema alert notifications to make it
easier to discern various notification types (e.g. alert, no data, ok).
 2017-02-27 17:10:52 +01:00
bergquist
05952688c5 tech: avoid using http.DefaultClient 2017-02-24 17:22:12 +01:00
bergquist
03354bc49a tech: replace context.TODO with background ctx 2017-02-24 09:20:28 +01:00
Carl Bergquist
5d3da99806 Merge pull request #7482 from dbrgn/master 
Alerting: Add Threema Gateway integration
 2017-02-24 07:40:36 +01:00
Carl Bergquist
bef216b6f4 Merge pull request #7526 from Mic92/master 
Add Pushover alert notifications
 2017-02-24 07:32:59 +01:00
Carl Bergquist
b4fd6f2d45 Merge pull request #7632 from grafana/alerting_notification_dedupe 
alerting: dedupe alert notifications when running multiple servers
 2017-02-22 10:48:41 +01:00
bergquist
00dddca26a alerting: dedupe alert notifications when running multiple servers 
alert notifications will only be sent if the database value
is updated.

ref #6957
 2017-02-21 16:54:49 +01:00
Daniel Lee
96a3ed0ac3 docs: new /api/users/search route 
ref #7469. Description of new route that
adds paging for the users list.
 2017-02-21 16:09:15 +01:00
bergquist
70b36a02af Revert "tech: use context package over xperimental version" 
This reverts commit 99f1c30071.
 2017-02-20 22:04:51 +01:00
bergquist
99f1c30071 tech: use context package over xperimental version 2017-02-20 21:44:15 +01:00
bergquist
072c1559ba middlware: prevent orgredirect to open body stream 
the org redirecter opened the body stream by misstake. Causing
downstream code to start reading from an empty stream and raise errors.
 2017-02-20 11:38:29 +01:00
bergquist
6115941df0 middleware: rename org-id -> orgId 2017-02-17 15:18:40 +01:00
bergquist
5174d050f2 middlware: change org when url contains orgid 
closes #6948
ref #1613
 2017-02-17 15:02:14 +01:00
bergquist
12f1ea71fd chore: delete empty test 2017-02-17 12:07:46 +01:00
bergquist
cf871b1284 http: close http server gracefully. 2017-02-17 10:33:47 +01:00
bergquist
52566376b2 tech(server): remove unused code 2017-02-17 10:18:11 +01:00
Roman Vynar
4fcd5eab29 Add advanced TLS settings to harden setup. (#7347) 
* Hardcoded the most secured TLS options.
 2017-02-15 14:29:20 +01:00
Torkel Ödegaard
902cf5f889 fix(): google analytics fix 2017-02-15 14:26:57 +01:00
bergquist
bd010289b2 alerting: images in alert notifications is now optional 
its now possible to turn of image uploading in alert notifications
for those who operate on very sensitive data.

closes #7419
 2017-02-15 14:17:36 +01:00
bergquist
f14e25612e annotations: go vet fixes 2017-02-15 14:15:42 +01:00
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