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
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
Jörg Thalheim
f069aae576
Add Pushover alert notifications
...
Pushover is a service for getting real-time
notifications on your mobile devices and desktop
computers: https://pushover.net
2017-02-10 22:44:33 +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
Danilo Bargen
689f5cb686
feat(alerting): Text formatting for Threema alert messages
2017-02-07 11:14:57 +01:00
Danilo Bargen
d1a5d9c15c
feat(alerting): Add Threema Gateway integration
...
This commit adds alerting support for Threema Gateway. It supports all
Simple IDs (managed by the Gateway server).
More information can be found on https://gateway.threema.ch/
2017-02-07 11:14:57 +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
Alexander Menzhinsky
30c334a2b8
Add common type for oauth authorization errors
2017-02-01 16:42:59 +03:00
Torkel Ödegaard
01f1c1b8dc
feat(): began refactoring PR #5364
2017-01-31 17:10:27 +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
huydx
376d2d56bf
(feature) add LINE notify to notifier
2017-01-19 17:26:53 +09:00
bergquist
4ea4e0436a
feat(mailer): set localname to hostname
...
Some email providers does not accept localhost
in the HELO message. So we set it to hostname
instead. Our hope is that should be enough for
those providers who does not accept localhost.
closes #7223
2017-01-17 10:36:04 +01:00
bergquist
e78da57e4d
feat(alerting): shows when no_data triggered alerts
...
closes #7035
ref #7257
2017-01-17 09:49:25 +01:00
bergquist
06440ef57b
tech(dataproxy): moves cfg to [dataproxy]
2017-01-16 12:43:59 +01:00
bergquist
d4a96b9741
tech(dataproxy): make the code a little bit more defensive
2017-01-16 12:24:08 +01:00
bergquist
dd84fb563a
style(dataproxy): renames log functions
2017-01-16 12:23:49 +01:00
bergquist
51bca7d84b
tech(dataproxy): moves all parameters to Info call
2017-01-16 12:16:41 +01:00
bergquist
839eb97061
Merge branch 'feature/dataProxyAuditLog' of https://github.com/Ricky-N/grafana into Ricky-N-feature/dataProxyAuditLog
2017-01-16 12:02:43 +01:00
Ryuichi Sakai
1bc55a2d38
Enable image rendering to use browser time offset
2017-01-15 22:01:28 +09:00
Carl Bergquist
c43bb7fb99
Extractor should not modify dashboard json ( #7256 )
...
* test(dashboard): tests that he extractor does not modify original json
* feat(extractor): validate a cloned version of the dashboard json
2017-01-13 15:46:23 +01:00
Carl Bergquist
1efeaafdbf
Merge pull request #7249 from grafana/alerting_test_alertrule
...
Enable error and no_data overrides when testing alerting.
2017-01-13 15:18:02 +01:00
Torkel Ödegaard
d354f3a8af
fix(alerting): fixed evaluation for no_value condition, fixes #7244 ( #7247 )
...
* fix(alerting): fixed evaluation for no_value condition, fixes #7244
* feat(alerting): moving null library into grafana, fixing handling on no value / no series
2017-01-13 12:32:30 +01:00
bergquist
0873d493c2
feat(alerting): moves getNewState to evalHandler
...
closes #7149
2017-01-13 11:02:24 +01:00
Ricky Niemi
0b48e48e3d
Small whitespace fix on setting file
2017-01-11 07:51:46 -08:00
Ricky Niemi
269d16301a
Rename to audit logging to data proxy logging
2017-01-11 07:40:06 -08:00
Ricky Niemi
0fee7c863a
Gate data proxy audit logging behind audit_logging server setting
2017-01-11 07:22:57 -08:00
Mitsuhiro Tanda
7e4c101d02
S3 IAM support ( #7058 )
...
* add s3 dependencly
* rewrite image uploader by aws-sdk-go
* improve backward compatibility of s3 image uploading
* set default for expires option
* remove acl and expires
2017-01-11 14:00:49 +01:00
Lee Briggs
2e796da441
Add support for sensu notifications ( #7207 )
2017-01-11 13:57:07 +01:00
Torkel Ödegaard
149dd78298
Merge branch 'built_in_template_variables'
2017-01-11 12:10:33 +01:00
Torkel Ödegaard
b475f91387
feat(templating): completed work on built in template variables and , closes #7190 , refactors #7170
2017-01-11 12:10:26 +01:00
Ricky Niemi
d9cbb994b8
Clean up audit log formatting and code
2017-01-10 11:42:03 -08:00
Ricky Niemi
d03977ac0e
Add initial audit logging to data proxy
2017-01-09 22:59:43 -08:00
Mark Theisen
afda9cbb2d
Fix webhook username mismatch
...
Fixing variable name mismatch so that the Authorization HTTP header is added to webhook notifications.
2017-01-09 17:18:53 +01:00
Torkel Ödegaard
31bd725559
Merge branch 'notifier-refactor'
2017-01-06 12:17:34 +01:00
Mitsuhiro Tanda
dfaefe34a4
add cloudwatch region ( #7161 )
2017-01-06 12:05:27 +01:00
Torkel Ödegaard
b8f559aecb
feat(plugins): made notifiers more pluggable and easier to support many of them, new ones can now be added without modifying any existing file, #7162
2017-01-06 12:04:25 +01:00
Torkel Ödegaard
d6a2431767
Merge branch 'notifier-telegram-messenger' of https://github.com/leonoff/grafana into leonoff-notifier-telegram-messenger
2017-01-06 10:27:20 +01:00
Utkarsh Bhatnagar
65057212e7
Org update should throw error if not found ( #7066 )
...
* Org update should give error if not found
* Used affected rows
2017-01-03 09:21:18 +01:00
bergquist
9a3e51894b
tech(alerting): remove unused property
2017-01-03 08:11:17 +01:00
bergquist
2e7d222f6e
Revert "tech: remove unused code"
...
This reverts commit d9131be0a5
2017-01-02 13:22:37 +01:00
bergquist
d9131be0a5
tech: remove unused code
2017-01-02 13:11:09 +01:00
Mitsuhiro Tanda
9855ea8c6c
handle sts error ( #7088 )
2016-12-30 16:59:06 +01:00
Mikhail Leonov
e32a653cb6
Added Telegram Messenger notification destination
2016-12-30 15:57:12 +03:00
Kerim Satirli
48b57afe84
Adds London and Canada AWS Regions
2016-12-27 14:25:12 +01:00
Darrian
27ead53382
Set indentation to tabs
2016-12-21 22:54:56 +00:00
Darrian
b8572b69f0
Register new queries available in InfluxDB - Holt Winters fixes #5619
...
For correct data fill on holt winters predictions, the time function
needed modification to allow a 2nd param for offset, as per
https://docs.influxdata.com/influxdb/v1.0/query_language/data_exploratio
n/#advanced-group-by-time-syntax
2016-12-21 22:30:32 +00:00
Torkel Ödegaard
fad07f0d15
refactor(http): refactoring http server
2016-12-21 14:36:32 +01:00
bergquist
4e306590f8
Merge branch 'v4.0.x'
2016-12-21 10:02:28 +01:00
bergquist
8cef4cc74e
fix(influxdb): handles time(auto) like time($interval)
...
closes #6997
2016-12-21 10:01:20 +01:00
Torkel Ödegaard
8bccbdafd2
feat(live): minor progress on stream manager
2016-12-21 09:16:29 +01:00
Torkel Ödegaard
b7827962dc
feat(live): just wanted to checkout how far I got on the websocket data source
2016-12-20 16:09:04 +01:00
Utkarsh Bhatnagar
13c4ce68ee
Added name and id in response of create/update ( #7016 )
2016-12-20 13:02:26 +01:00
bergquist
80d438ca49
chore(alerting): removes double logging
2016-12-20 08:34:44 +01:00
bergquist
a230ff65a9
fix(alerting): typo
2016-12-19 16:44:59 +01:00
Carl Bergquist
9135abf3ae
Merge pull request #6996 from bergquist/pause_all_alerts
...
Pause all alerts
2016-12-19 16:38:44 +01:00
bergquist
6c2c3c7e24
Revert "fix(alerting): pause dto can only pause one"
...
This reverts commit b2c5a6a037
2016-12-19 16:07:55 +01:00
bergquist
b2c5a6a037
fix(alerting): pause dto can only pause one
2016-12-19 16:05:24 +01:00
bergquist
71f406558e
tech(alerting): remove comments
2016-12-19 15:40:09 +01:00
bergquist
a2257ec3d0
tech(alerting): renames pause all method
2016-12-19 15:17:49 +01:00
bergquist
ecf44d4d9c
tech(): go fmt code
2016-12-19 13:26:42 +01:00
bergquist
ecdf1888c4
feat(alerting): removes pause per datasource
2016-12-19 13:24:45 +01:00
bergquist
6b9db0c0c5
style(alerting): simplify support for pausing multiple alerts
2016-12-19 08:18:42 +01:00
bergquist
4ef95cfd31
style(api): reduce code complexity
2016-12-16 16:07:23 +01:00
bergquist
1f8f3ed038
style(api): extracts filter logic for mass pause
2016-12-16 15:19:13 +01:00
bergquist
fb6aa0e026
feat(api): adds endpoint for mass pausing alerts
...
ref #6589
2016-12-16 15:00:58 +01:00
Mitsuhiro Tanda
81394fcaa4
add cloudwatch internal metrics ( #6990 )
2016-12-16 10:48:05 +01:00
Mitsuhiro Tanda
f8d6902428
fix cloudwatch percentile ( #6989 )
2016-12-16 10:47:41 +01:00
bergquist
df3adbc0f8
refactor(mqe): reduce duplication
2016-12-16 08:01:58 +01:00
bergquist
c467e48940
feat(notifications): removes html escaping subject
...
closes #6905
2016-12-15 14:27:33 +01:00
Torkel Ödegaard
0c94194a5b
Merge branch 'master' of github.com:grafana/grafana
2016-12-15 13:57:05 +01:00
Torkel Ödegaard
35b970347a
Merge branch 'v4.0.x'
2016-12-15 13:55:26 +01:00
Torkel Ödegaard
497a1fcefc
Merge branch 'v4.0.x' of github.com:grafana/grafana into v4.0.x
2016-12-15 13:54:58 +01:00
