bergquist
|
eb673fd16d
|
fix(middleware): typo
|
2016-09-12 10:11:55 +02:00 |
|
Torkel Ödegaard
|
014b70ded9
|
fix(graph): fixed showing rendering error in inspector, fixes #5995
|
2016-09-10 12:00:33 +02:00 |
|
Torkel Ödegaard
|
7aab4a4a59
|
fix(table): fixed issue with using mixed data source in table panel, fixes #5999
|
2016-09-10 09:57:25 +02:00 |
|
Chen Chenglong
|
7b1c374f64
|
support connect ldap server with starttls (#5969)
* support connect ldap server with starttls
* add more doc for start_tls option
|
2016-09-10 09:40:56 +02:00 |
|
bergquist
|
4edb31723c
|
fix(metrics): ignore datasource proxy requests
|
2016-09-09 13:53:50 +02:00 |
|
bergquist
|
e7b56c6389
|
tech(metrics): move all request counters into one middleware
|
2016-09-09 13:28:19 +02:00 |
|
bergquist
|
583790e650
|
fix(alering): the crocdile turned on me > <
closes #5855
|
2016-09-09 07:42:07 +02:00 |
|
Carl Bergquist
|
51d2534f6a
|
Merge pull request #5994 from mtanda/prometheus_fix_legend_template
(prometheus) fix template variable expansion in legend
|
2016-09-08 18:37:27 +02:00 |
|
Mitsuhiro Tanda
|
9d09e5bbd0
|
(prometheus) fix template variable expansion in legend
|
2016-09-09 00:46:04 +09:00 |
|
bergquist
|
aa80b52c07
|
feat(alerting): make it possible to skip ssl verification for alerting https requests
|
2016-09-08 16:29:31 +02:00 |
|
bergquist
|
7b9099ef93
|
fix(query): requires all that all series are empty to set NoDataFound
|
2016-09-08 14:33:10 +02:00 |
|
bergquist
|
9511f89a22
|
fix(alerting): fixes bug in query conditions
|
2016-09-08 13:28:41 +02:00 |
|
bergquist
|
bec099cd84
|
tech: remove unused files
|
2016-09-08 11:41:56 +02:00 |
|
bergquist
|
3c9432b7e9
|
fix(metrics): default updateSince to ms
|
2016-09-08 10:48:11 +02:00 |
|
bergquist
|
acf74cdacc
|
fix(alerting): change execution time to ms
|
2016-09-08 10:45:10 +02:00 |
|
bergquist
|
5f934e0238
|
feat(emails): move bg color to main table
|
2016-09-08 09:59:51 +02:00 |
|
bergquist
|
21c5b543fb
|
feat(profile): hide orgs list when it only contains one org
|
2016-09-08 09:03:29 +02:00 |
|
bergquist
|
592ae5a39a
|
tests(alerting): fixes broken tests. pointers and stuff 🤷
|
2016-09-07 17:05:41 +02:00 |
|
bergquist
|
30f36fe2c4
|
docs(changelog): add note about merging #4718
|
2016-09-07 15:24:38 +02:00 |
|
bergquist
|
f56d45ac56
|
feat(alerting): include default notifications in alert tab
|
2016-09-07 15:13:24 +02:00 |
|
bergquist
|
c769148701
|
Merge branch 'emails'
|
2016-09-07 13:52:16 +02:00 |
|
bergquist
|
62372978e4
|
style: convert tabs to spaces
|
2016-09-07 13:51:17 +02:00 |
|
bergquist
|
59cb51dc6f
|
test(emails): update fake data model
|
2016-09-07 13:47:57 +02:00 |
|
bergquist
|
9595916a5f
|
feat: right align value metrics
|
2016-09-07 13:47:21 +02:00 |
|
bergquist
|
712061ab4f
|
test(alerting): fixes broken unit tests
|
2016-09-07 11:45:38 +02:00 |
|
bergquist
|
166df66f66
|
docs(go): update go dep to 1.6
|
2016-09-07 11:28:22 +02:00 |
|
bergquist
|
f26824049f
|
Merge branch 'master' into emails
|
2016-09-07 11:19:52 +02:00 |
|
bergquist
|
374016b9b5
|
Merge branch 'kfitzpatrick-custom-github-style-oauth'
|
2016-09-07 11:07:30 +02:00 |
|
bergquist
|
10b3ee362c
|
docs(oauth): add generic_auth to docs
|
2016-09-07 11:06:59 +02:00 |
|
bergquist
|
53dddf1a8f
|
fix(oauth): remove github refs from generic auth
|
2016-09-07 10:55:46 +02:00 |
|
bergquist
|
3b6820ef03
|
feat(oauth): create struct for generic oauth and add config values
|
2016-09-07 10:34:56 +02:00 |
|
Torkel Ödegaard
|
0d083bad14
|
Merge branch 'master' of github.com:grafana/grafana
Conflicts:
pkg/components/imguploader/s3uploader.go
|
2016-09-07 10:14:36 +02:00 |
|
Torkel Ödegaard
|
50b41130ca
|
feat(alerting): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations
|
2016-09-07 10:11:00 +02:00 |
|
bergquist
|
d1a7a23c84
|
test(imageupload): add more specific tests
torkels commit will fix this unit test :)
|
2016-09-07 10:05:01 +02:00 |
|
bergquist
|
4646723cbb
|
Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth
|
2016-09-07 08:15:44 +02:00 |
|
Torkel Ödegaard
|
fc8f0721cd
|
Merge branch 'master' of github.com:grafana/grafana
Conflicts:
pkg/services/alerting/eval_context.go
|
2016-09-06 20:40:49 +02:00 |
|
Torkel Ödegaard
|
fbae6abb3c
|
feat(alerting): progress on handling no data in alert query, #5860
|
2016-09-06 20:40:12 +02:00 |
|
bergquist
|
2e8d5ca519
|
docs(changelog): add note about updating systemd description
|
2016-09-06 17:32:18 +02:00 |
|
Carl Bergquist
|
a02bef7d94
|
Merge pull request #5971 from cicku/master
Update systemd unit's description to be more understandable
|
2016-09-06 17:11:46 +02:00 |
|
Christopher Meng
|
6afb456bef
|
Update systemd unit's description to be more understandable
Signed-off-by: Christopher Meng <i@cicku.me>
|
2016-09-06 16:29:15 +02:00 |
|
bergquist
|
04690ca920
|
feat(alerting): add support for retries
ref #5855
|
2016-09-06 15:09:49 +02:00 |
|
bergquist
|
0d7a871223
|
style(alerting): remove blank lines
|
2016-09-06 14:57:15 +02:00 |
|
bergquist
|
22805ce56b
|
fix(alert_tab): fix broken alert history
|
2016-09-06 14:42:34 +02:00 |
|
bergquist
|
55b560a4a8
|
feat(alerting): filter notifications based on severity
closes #5851
|
2016-09-06 14:27:48 +02:00 |
|
Torkel Ödegaard
|
b1ed641d73
|
fix(graph): fixed issue with duplicate metric calls when doing full page reload of graph in edit/view mode
|
2016-09-06 09:20:34 +02:00 |
|
Torkel Ödegaard
|
6b17cdbca6
|
feat(alerting): Save As removes alerts from panels, closes #5965
|
2016-09-06 09:14:11 +02:00 |
|
bergquist
|
2ca7284a56
|
tech(notifications): splitt into 3 queries
closes #5883
|
2016-09-06 08:43:15 +02:00 |
|
bergquist
|
c893e5d241
|
feat(notifications): add support for default notifications
ref #5883
|
2016-09-05 21:35:37 +02:00 |
|
bergquist
|
eb0396ad95
|
chore(tsdb): remove some logging
|
2016-09-05 21:35:24 +02:00 |
|
bergquist
|
015423b233
|
tech(gitignore): ignore vscode folder
|
2016-09-05 21:35:24 +02:00 |
|