1f50c6d76f
Merge branch 'v4.0.x'
2016-12-05 11:20:14 +01:00
cc46b81961
fix(rendering): fixed server side rendering issue when sertting enforce_domain to true, fixes #6769
2016-12-05 11:20:01 +01:00
d1feaaf4f3
Merge branch 'v4.0.x'
2016-12-05 10:54:01 +01:00
ab07667b69
fix(rendering): minor fix for server side rendering when using non default http addr setting and non default domain setting, #6813
2016-12-05 10:51:46 +01:00
b81e97c99c
webhook: adds json content-type
...
closes #6822
2016-12-05 10:46:04 +01:00
0403f53b6f
feat(webhook): adds alert rule message to webhook
...
close #6807
2016-12-05 09:34:35 +01:00
6c9cf87080
feat(alerting): calculate avg of valid points
2016-12-02 23:44:14 +01:00
c9b7f8603e
tech(): replace spaces to handle input more graceful
2016-12-02 23:43:02 +01:00
9dd6cf45ac
feat(webhook): adds alert rule message to webhook
...
close #6807
2016-12-02 22:24:36 +01:00
f70d7ff3a3
fix(influxdb): align tsdb.influxdb with dataproxy
...
ref #6784
2016-12-02 21:10:29 +01:00
b4b7156f42
fix(webdav): adds missing auth headers
...
closes #6779
2016-12-02 16:20:15 +01:00
bc69c8ef40
Add transport cache for reverse proxy ( #6776 )
...
* Add transport cache for reverse proxy
* Use updated at in cache
2016-12-02 15:39:57 +01:00
9ed21c6a16
Add transport cache for reverse proxy ( #6776 )
...
* Add transport cache for reverse proxy
* Use updated at in cache
2016-12-02 15:39:28 +01:00
d3e47e50c1
swap member declaration in StandardGauge to avoid problem with atomic on arm and x86-32
2016-12-01 21:26:54 +01:00
834e3f1c29
swap member declaration in StandardGauge to avoid problem with atomic on arm and x86-32
2016-11-30 21:57:18 +00:00
3c662ade8c
Merge pull request #6698 from grafana/cloudwatch_configurable_keys
...
Cloudwatch configurable keys from config page.
2016-11-29 23:37:13 +01:00
83e90325c9
chore(victorops): remove unused code
2016-11-29 22:26:42 +01:00
a6ea2f4fdb
Merge branch 'victorops' of https://github.com/ichekrygin/grafana into ichekrygin-victorops
2016-11-29 22:22:25 +01:00
b47410af6a
Merge pull request #6670 from tomkozlowski/feature/postgres-certs
...
generalized database connection cert support and added to postgres
2016-11-29 21:40:27 +01:00
253324fc32
style(sqlstore): remove comment
2016-11-29 21:24:45 +01:00
f6557f14b7
Merge pull request #6741 from dpavlos/fix_5443
...
[5443] Check if title is empty before save a new dashboard
2016-11-29 21:22:07 +01:00
5a0fc434f3
Merge pull request #6722 from dpavlos/fix_6679
...
[6679] Check if org exists before delete it
2016-11-29 21:12:02 +01:00
360516ed41
feat(metrics): change active alerts to guage
2016-11-29 16:46:25 +01:00
7e831e10a2
updated version in grafana-server main.go
2016-11-29 10:41:31 -05:00
7f7f080ad8
[5443] Check if title is empty before save a new dashboard
2016-11-29 12:25:20 +02:00
ab2f109443
fix(config): error message for broken config file
...
closes #6731
2016-11-28 17:55:18 +01:00
0064331bbf
[6679] Check if org exists before delete it
2016-11-28 00:09:01 +02:00
bdfb773a98
fix(alerting): fixes broken no_value evaluator
...
closes #6701
2016-11-27 16:53:29 +01:00
7bc1c3cc1c
feat(cloudwatch): make it possible to reset keys
...
closes #6697
2016-11-24 16:37:33 +01:00
3d21f06d5b
tech(cloudwatch): store keys in secure json blob
2016-11-24 14:16:52 +01:00
0ea6537916
tech(cloudwatch): refactoring
2016-11-24 14:00:05 +01:00
f7e12e5f93
test(cloudwatch): fixes failing tests
2016-11-24 14:00:05 +01:00
64784db870
feat(cloudwatch): adds access and secret key to edit config page
2016-11-24 14:00:05 +01:00
0618122bcd
feat(httpsettings): add tls auth option
...
- Three text areas where the user can paste
in the CA Cert (optional), Client Cert
and Client Key.
- Tooltips for Auth checkboxes with brief
descriptions of what With Credentials and
With CA Cert are.
- Adds popover for TLS Auth header too.
- Aligns gf-form elements as labels and
checkboxes were not aligned before.
- Makes CA Cert optional as it is only
needed for self-signed certs.
2016-11-24 13:33:28 +01:00
b6b53c0f4b
fix(dataproxy): test with CA Cert
2016-11-24 13:22:25 +01:00
2893b25a05
feat(datasources): allow updating of tls certs
...
The tls files are stored as a json blob in the
SecureJsonData field. To update one file, the
json has to be fetched from the db first and
then updated with the cert file that has been
changed.
Also, a change to the dto with flags that are
used in the frontend to show if a file has
been uploaded. For example, if tlsClientKeySet
is set to true then means a file for the
client key is saved in the db. This is to
avoid sending any private data to the frontend.
2016-11-24 13:22:25 +01:00
387f8cc0c6
feat(dataproxy): TLS CA Cert for self-signed certs
...
For self-signed TLS Certificates, authentication
with InsecureSkipVerify set to false then this
error will occur:
x509: certificate signed by unknown authority
The solution is to allow the user to upload the
CA cert as well.
2016-11-24 13:22:25 +01:00
c9b2c694f1
refactor(dataproxy): TLS Client Auth
...
Use a SecureJsonData field for TLS
Client Auth instead of 3 new db
fields. Same model as used for
PluginSettings.
Saves and encrypts the pem file
content rather than just saving
the paths to the cert and key.
This allows for uploading from
the Edit Datasource page in
Grafana.
2016-11-24 13:22:25 +01:00
af07adb146
refactor(securejsondata): extract to class
...
Extract from pluginsettings class so that the
securejsondata type can be used in the other
classes. Encrypt and decrypt functions
extracted too.
2016-11-24 13:22:25 +01:00
56b7e2dfaf
Added support for TLS client auth for datasource proxies ( #5801 )
2016-11-24 13:22:25 +01:00
2233938ba7
Merge branch 'master' into getting-started-panel
2016-11-24 13:17:22 +01:00
421c1eed82
fix(dashboard): fixes bug when saving dashboards
2016-11-24 11:22:13 +01:00
df2b2e3058
feat(alerting): validate alerts before saving dashboard ( #6691 )
...
ref #6576
2016-11-24 09:50:35 +01:00
ea5cb0d076
fix(server side rendering): Fixed address used when rendering panel via phantomjs and using non default http_addr config, fixes #6660
2016-11-23 15:35:43 +01:00
773fb5d1ae
fix(alerting): check if dashboard is saved before testing alert rule, fixes #6549
2016-11-23 14:55:10 +01:00
c365d52a80
[6486] Fix status code when adding an existing user to org ( #6678 )
2016-11-23 14:38:44 +01:00
c21ffcc6c9
generalized database connection cert support and added to postgres
2016-11-22 15:29:22 -08:00
6882dcfb99
feat(alerting): add backend support for median reducer
2016-11-22 14:09:35 +01:00
50811c80ea
fix(alerting): fixes bug that prevents noData from triggering
...
closes #6631
2016-11-22 11:47:52 +01:00
2b6013ce81
fix(notifications): failed image upload should not stop notification
...
closes #6638
2016-11-21 09:47:59 +01:00
Torkel Ödegaard
bergquist
stuart nelson
fg2it
Pavlos Daoglou
Daniel Lee
Joe Lanford
Tom Kozlowski