Torkel Ödegaard
cc46b81961
fix(rendering): fixed server side rendering issue when sertting enforce_domain to true, fixes #6769
2016-12-05 11:20:01 +01:00
Torkel Ödegaard
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
bergquist
b81e97c99c
webhook: adds json content-type
...
closes #6822
2016-12-05 10:46:04 +01:00
bergquist
0403f53b6f
feat(webhook): adds alert rule message to webhook
...
close #6807
2016-12-05 09:34:35 +01:00
stuart nelson
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
fg2it
d3e47e50c1
swap member declaration in StandardGauge to avoid problem with atomic on arm and x86-32
2016-12-01 21:26:54 +01:00
bergquist
360516ed41
feat(metrics): change active alerts to guage
2016-11-29 16:46:25 +01:00
Torkel Ödegaard
7e831e10a2
updated version in grafana-server main.go
2016-11-29 10:41:31 -05:00
bergquist
ab2f109443
fix(config): error message for broken config file
...
closes #6731
2016-11-28 17:55:18 +01:00
bergquist
bdfb773a98
fix(alerting): fixes broken no_value evaluator
...
closes #6701
2016-11-27 16:53:29 +01:00
Daniel Lee
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
Daniel Lee
b6b53c0f4b
fix(dataproxy): test with CA Cert
2016-11-24 13:22:25 +01:00
Daniel Lee
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
Daniel Lee
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
Daniel Lee
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
Daniel Lee
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
Joe Lanford
56b7e2dfaf
Added support for TLS client auth for datasource proxies ( #5801 )
2016-11-24 13:22:25 +01:00
bergquist
421c1eed82
fix(dashboard): fixes bug when saving dashboards
2016-11-24 11:22:13 +01:00
Carl Bergquist
df2b2e3058
feat(alerting): validate alerts before saving dashboard ( #6691 )
...
ref #6576
2016-11-24 09:50:35 +01:00
Torkel Ödegaard
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
Torkel Ödegaard
773fb5d1ae
fix(alerting): check if dashboard is saved before testing alert rule, fixes #6549
2016-11-23 14:55:10 +01:00
Pavlos Daoglou
c365d52a80
[6486] Fix status code when adding an existing user to org ( #6678 )
2016-11-23 14:38:44 +01:00
bergquist
6882dcfb99
feat(alerting): add backend support for median reducer
2016-11-22 14:09:35 +01:00
bergquist
50811c80ea
fix(alerting): fixes bug that prevents noData from triggering
...
closes #6631
2016-11-22 11:47:52 +01:00
bergquist
2b6013ce81
fix(notifications): failed image upload should not stop notification
...
closes #6638
2016-11-21 09:47:59 +01:00
bergquist
5dea0fda51
fix(settings): remove nil pointer exception
2016-11-18 16:43:14 +01:00
bergquist
61bb9cbc13
test(alerting): fixes broken unit test
2016-11-18 10:53:27 +01:00
bergquist
a3b0fbcaba
fix(influxdb): fixes broken tag rendering for influxdb alerting
...
closes #6626
ref #6523
2016-11-17 15:50:49 +01:00
Torkel Ödegaard
7ce33c31ec
Merge branch 'master' of github.com:grafana/grafana
2016-11-17 15:50:08 +01:00
Torkel Ödegaard
62e8a039a1
refactor(alerting): refactoring PR for OR conditions, #6579
2016-11-17 15:48:15 +01:00
bergquist
3ea66ebe3f
fix(alerting): remove possible divide by zero panic
...
ref #6599
2016-11-17 15:20:14 +01:00
Torkel Ödegaard
457ae74343
Merge branch 'or_alerting' of https://github.com/utkarshcmu/grafana into utkarshcmu-or_alerting
2016-11-17 14:43:24 +01:00
utkarshcmu
aae33b36dd
Added tests for firingEvaluation string
2016-11-17 01:41:23 -08:00
utkarshcmu
fc82dac868
Added braces to single condition firingEvaluation string
2016-11-17 01:30:50 -08:00
utkarshcmu
690868c837
Added firingEvalution to Rule test
2016-11-17 01:28:17 -08:00
Torkel Ödegaard
18e965c775
fix(error handling): fixed server side error handling page
2016-11-16 17:41:44 +01:00
Torkel Ödegaard
e3564d12a1
fix(404): fixed 404 page
2016-11-16 17:09:00 +01:00
Dan Cech
eacb7c8aba
Merge pull request #6584 from tomkozlowski/bugfix/oauth-login-bearer-token
...
explicitly set oauth2 token to Bearer Type
2016-11-16 10:35:32 -05:00
Tom Kozlowski
a353c8d1bb
added explicitly setting token as Bearer Type
2016-11-16 09:55:14 -05:00
utkarshcmu
8d0bcd23f8
Added tests for checking nested operators
2016-11-15 08:07:05 -08:00
utkarshcmu
dfb1b1918c
Implemented operator based firiing in backend
2016-11-15 06:35:25 -08:00
bergquist
b9d709ab27
feat(alerting): improve error logging for extracting alerts
...
ref #6576
2016-11-15 11:47:46 +01:00
bergquist
4fdfee739a
fix(influxdb): add support for regex measurments
...
closes #6560
2016-11-14 08:48:19 +01:00
bergquist
a87fd11f26
feat(stats): add alerts to global admin stats
2016-11-11 14:04:38 +01:00
bergquist
ad97db937c
feat(stats_usage): add stats about alerts
2016-11-11 13:57:11 +01:00
bergquist
e04d27c0b0
fix(influxdb): return internal influxdb errors
...
ref #6523
2016-11-11 08:47:53 +01:00
bergquist
f924b241ae
tech(influxdb): refactor query builder
...
trying to reduce the amounts of moving parts for influxdb
2016-11-10 14:38:07 +01:00
bergquist
a948dfe514
fix(influxdb): fixes broken raw query usage
2016-11-10 14:18:10 +01:00
bergquist
ecba23e883
Merge branch 'master' into influxdb_alias_seriename
2016-11-10 12:22:17 +01:00
bergquist
4f3c8c6663
fix(influxdb): add default operator
...
ref #6523
2016-11-10 11:21:38 +01:00