Tiantian Gao
b2c14b858e
Fix http logging time_ms unit is wrong ( #8342 )
...
In fact, the unit of `time_ms` int http logging is not "ms", this patch fix it.
2017-05-11 08:53:40 +02:00
Pranay Kanwar
ee8799de88
Fix dropcounter option, is called dropResets ( #8336 )
2017-05-10 15:46:19 +02:00
Daniel Lee
4a35126bf6
api: health check returns 503 if db is failing
...
ref #3302
2017-05-10 15:23:59 +02:00
Torkel Ödegaard
b042c53980
ux: updated heatmap icon
2017-05-03 08:56:51 +02:00
Dan Cech
665cf55e6e
make generic oauth provider flexible enough to handle bitbucket's oauth implementation ( #8248 )
2017-05-02 14:37:56 +02:00
rogerswingle
02455753b5
Specify region for s3 ( #8251 )
2017-05-01 19:22:20 +02:00
Mitja Z
c92d719a72
added support for listening on unix socket #4030 ( #8221 )
2017-04-27 08:54:21 +02:00
Yaron de Leeuw
d4f7a2bc99
minor code style: use strings.Replace fourth argument in influxdb ( #8225 )
...
Remove 5 lines from the codebase and an unecessary function,
by calling `strings.Replace` with -1 for the fourth argument.
A better alternative to what was merged in #8037
2017-04-27 08:51:43 +02:00
Torkel Ödegaard
19a04b7e4a
change: minor change to health check api endpoint
2017-04-25 17:24:36 +02:00
Torkel Ödegaard
f6f2d85aa7
change: minor change to health check api endpoint
2017-04-25 17:24:06 +02:00
Daniel Lee
6538e86793
webdav: add tests + path.join for public url param
...
Fixes #7914 . Fixes #7921
2017-04-25 17:22:18 +02:00
fir4
6d9e8bd147
webdav: allow specification of a different public_url than upload url
2017-04-25 17:22:18 +02:00
Torkel Ödegaard
368e847d12
feat: added api health endpoint that does not require auth and never creates sessions, returns db status as well. #3302
2017-04-25 17:17:45 +02:00
Torkel Ödegaard
b780415f25
fix: change to remember me cookie encoding
2017-04-25 15:33:15 +02:00
Daniel Lee
aee4af2148
api: omit unused fields for /api/datasources
...
Fixes #7822
2017-04-25 15:23:36 +02:00
Torkel Ödegaard
87c978ebc9
fix: better error handling / messsage when testing email notification when stmp is not configured, fixes #8093
2017-04-25 13:16:41 +02:00
Dan Cech
b489e93d94
Config Array Syntax ( #8204 )
...
* refactor util encryption library so it doesn't have to import log
* add util.SplitString to handle space and/or comma-separated config lines
* go fmt
2017-04-25 09:14:29 +02:00
Torkel Ödegaard
ae5e004b69
mysql: time filter macro updated
2017-04-24 14:55:43 +02:00
Daniel Lee
7784e4e24b
mysql: add datetime type to table data
2017-04-23 21:56:58 +02:00
Daniel Lee
413ee33d5d
mysql: fix go vet error
2017-04-23 20:07:20 +02:00
Torkel Ödegaard
b22b3e5bb9
mysql: added default query template
2017-04-21 16:28:01 +02:00
Torkel Ödegaard
97e2d75f51
mysql: added support for tables in mysql queries
2017-04-21 15:07:43 +02:00
Torkel Ödegaard
c78c460f79
mysql: worked on mysql data soruce
2017-04-20 17:10:23 +02:00
Daniel Lee
6ec1d16327
fix: cli admin reset-password fixes cmd args
...
Fixes the homepath and config command line args. This allows the
command to be used even when the homepath is different from the
default.
Fixes #7730
2017-04-20 13:30:17 +02:00
Torkel Ödegaard
50e70cf3db
build: fixed unit test
2017-04-20 13:04:42 +02:00
Torkel Ödegaard
fc878bc8ad
build: fixed order
2017-04-20 11:59:11 +02:00
Torkel Ödegaard
11806dfa78
mysql: progress
2017-04-19 17:26:37 +02:00
Daniel Lee
ee3a553800
Merge pull request #8163 from bashgeek/telegram_metrics
...
Add metrics/matches to Telegram notifications (proposed fix for #8110 )
2017-04-19 15:03:03 +02:00
Daniel Schmitz
d123b951e9
Fixed parsing error
2017-04-19 17:02:52 +08:00
Torkel Ödegaard
e164eba677
mysql: began work on backend macro engine
2017-04-19 10:10:08 +02:00
Daniel Schmitz
7078d5d524
Added metrics/matches to telegram notifications; Added some HTML to beautify
2017-04-19 15:53:23 +08:00
Torkel Ödegaard
0bae7212f6
annotations: removed category stuff, my mistake, we need tags
2017-04-18 17:15:22 +02:00
Alexander Zobnin
7aa992bde4
initial category types
2017-04-17 18:56:39 +03:00
Alexander Zobnin
f0816b37bd
rename annotation_category to category
2017-04-17 18:53:10 +03:00
Torkel Ödegaard
60ef7d8768
Merge branch 'master' into create-annotations
2017-04-14 22:36:34 +02:00
Dan Cech
f490c5f12c
use X-Grafana-Org-Id header to ensure backend uses correct org ( #8122 )
2017-04-14 15:47:39 +02:00
Torkel Ödegaard
dbe5480edc
create annotations work
2017-04-14 11:41:02 +02:00
Torkel Ödegaard
2fce88ee62
ux: popover forms
2017-04-14 10:18:49 +02:00
Dan Cech
3a607f96a3
fix bug in log sprintf calls ( #8124 )
2017-04-14 07:45:36 +02:00
Torkel Ödegaard
dbeeb32ab6
Merge branch 'master' into popover-forms
2017-04-13 16:22:08 +02:00
Alexander Zobnin
ab99a7c1c7
graph(create annotation): add initial annotation_category table
2017-04-13 16:57:22 +03:00
Torkel Ödegaard
593b2ef866
annotation: added region support to annoations
2017-04-12 16:26:34 +02:00
Torkel Ödegaard
0156a94a49
annotations: you can now read annoations via manually created annoation query
2017-04-12 15:46:41 +02:00
Torkel Ödegaard
8eb112d119
plugins: refactoring builtIn data source concept, now means data source plugins that you do not need to add via data sources page, that is automatically added as selectable data source, #8095
2017-04-12 08:23:44 +02:00
Torkel Ödegaard
e80494390a
Merge branch 'always_displayed_datasources' of https://github.com/ctide/grafana into ctide-always_displayed_datasources
2017-04-12 07:44:59 +02:00
Torkel Ödegaard
b3df1aa9bd
org: fixed issue with orgId query param redirect handling when grafana is under subpath and reverse proxy, fixes #8089
2017-04-12 07:11:08 +02:00
Mitsuhiro Tanda
d2bf2e86ed
upgrade to aws-sdk-go v1.8.11 ( #8091 )
...
* upgrade to aws-sdk-go v1.8.11
* fix test
2017-04-12 06:40:44 +02:00
Chris Burkhart
d12dc2bfa7
Add alwaysDisplayed option to datasource plugins, this will allow it to show up as an option to select when adding queries to a panel without actually adding it as a datasource.
2017-04-11 13:47:53 -07:00
Torkel Ödegaard
07466b6725
security: fixed returning info on weither user exists or not in password reset call, fixes #7619
2017-04-11 16:50:16 +02:00
Torkel Ödegaard
83e0f69cde
Merge branch 'master' of github.com:grafana/grafana
2017-04-11 14:43:40 +02:00
Torkel Ödegaard
9bdcc4ec5f
influxdb: holt winters edits
2017-04-11 14:40:08 +02:00
Daniel Lee
3ca3c96226
profiling: adds profiling and tracing
...
If grafana-server binary is started with the -profile flag then
tracing will create a trace.out file and pprof data can be accessed
on the 6060 port.
A custom port for pprof profiling can be set with the -profile-port
flag.
2017-04-11 10:32:18 +02:00
Alexander Zobnin
f42202e665
Merge branch 'master' into graph-annotations
2017-04-11 10:27:37 +03:00
Alexander Zobnin
d553498a33
graph(add annotation): initial backend implementation #1286
2017-04-10 20:22:58 +03:00
Torkel Ödegaard
0384eecf5c
fix: minor fix for bug when saving alert with empty message, fixes #7927
2017-04-10 15:26:05 +02:00
Alfred Krohmer
41171f8a5c
Add a link to a graph image in Pushover notifications ( #8075 )
2017-04-10 09:17:37 +02:00
Torkel Ödegaard
1cd632cc43
plugins: added state property to plugins
2017-04-07 12:00:03 +02:00
Torkel Ödegaard
26804d630f
Merge branch 'master' into sql-proxy
2017-04-07 10:34:51 +02:00
Torkel Ödegaard
f5f0d94ad4
fix: temp/testing fix for hanging issue, #8033
2017-04-06 13:18:50 +02:00
Alexander Zobnin
2b81bfe9bf
alerting: fix $timeFilter cannot be used twice ( #7969 ) ( #8037 )
2017-04-05 17:17:55 +02:00
Torkel Ödegaard
95e0010a5b
fix: sqlite3 and concurrent write requests caused database locked error some times, depending on how many concurrent requests and speed of disk drive. Fixed by reducign the number of concurrent db connections to 1 for sqlite3, fixes #7992
2017-04-03 09:42:11 +02:00
Torkel Ödegaard
5af81b974e
mysql: graph showing
2017-03-31 13:57:10 +02:00
Torkel Ödegaard
a7babfb7cf
tech: updated xorm libs
2017-03-31 12:54:39 +02:00
Torkel Ödegaard
e5a5bef200
mysql: minor update
2017-03-31 12:49:05 +02:00
Torkel Ödegaard
d6d2080f11
mysql: minor progress on response processing
2017-03-31 11:45:25 +02:00
Torkel Ödegaard
bd4f073425
mysql: minor update
2017-03-30 20:23:40 +02:00
Torkel Ödegaard
998f04e1e8
mysql: testdata
2017-03-30 20:01:04 +02:00
Torkel Ödegaard
34d92b0e79
mysql: starting work on test data
2017-03-30 18:03:50 +02:00
Torkel Ödegaard
080d2a2054
mysql: reading arbitrary SQL data in go is really strange, data is only in strings?
2017-03-30 13:46:46 +02:00
Torkel Ödegaard
00fcaaf171
mysql: commented out old code from old PR
2017-03-29 22:55:37 +02:00
Torkel Ödegaard
8f90c6115d
mysql: progress on mysql data source
2017-03-29 22:54:18 +02:00
Torkel Ödegaard
6965064ea9
Merge branch 'master' into sql-proxy
2017-03-29 16:40:14 +02:00
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
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
