bergquist
3b4e55216c
docs(changelog): add note about fixing #6679
2016-11-29 21:14:37 +01:00
Carl Bergquist
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
bergquist
b00e9390d3
docs(v4): update docs for v4
2016-11-29 19:03:33 +01:00
bergquist
a73bebbf3d
tech(build): update publish script for 4.0.x release
2016-11-29 18:18:44 +01:00
bergquist
aed695ebe0
tech(build): set master to 4.1.0 pre
2016-11-29 18:03:20 +01:00
bergquist
9143165580
tech(build): change windows build branch
2016-11-29 17:41:18 +01:00
Torkel Ödegaard
25a5fc465c
fix(row): fixed dropping new panels onto panels, should split target panel
2016-11-29 11:38:02 -05:00
Torkel Ödegaard
7276b00fc7
fix(row): fixed dropping new panels onto panels, should split target panel
2016-11-29 11:37:06 -05:00
bergquist
567c2a1799
tech(build): update branch to package
2016-11-29 17:31:15 +01:00
bergquist
231492d443
tech(build): change windows build branch
2016-11-29 17:03:49 +01:00
bergquist
64f371a32d
tech: upgrade package json to v4.0.0
2016-11-29 16:51:38 +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
Pavlos Daoglou
7f7f080ad8
[5443] Check if title is empty before save a new dashboard
2016-11-29 12:25:20 +02:00
Dirk le Roux
e0073d7e54
Fixed spelling error
2016-11-29 08:32:51 +02:00
Dirk le Roux
6412bd2f57
oAdded value type documentation to singlestat panel
...
Signed-off-by: Dirk le Roux <dirk.leroux@gmail.com >
2016-11-29 08:26:32 +02:00
Dirk le Roux
49dda7e5c1
first, delta, range passing unit tests
...
Signed-off-by: Dirk le Roux <dirk.leroux@gmail.com >
2016-11-29 08:26:31 +02:00
Ryan McKinley
0534d43a6e
use ms when query less then 5 mins
2016-11-28 14:57:36 -08:00
Ryan McKinley
1ce0d81736
Merge remote-tracking branch 'grafana/master'
2016-11-28 13:38:18 -08:00
bergquist
f7e8e9c9af
docs(readme): bump golang version
2016-11-28 20:47:04 +01:00
Carl Bergquist
2bdb2f79ec
fix(table): renderes empty date column as '-' ( #6736 )
...
* fix(table): renderes empty date column as '-'
closes #6728
* docs(changelog): add note about closing 6728
2016-11-28 14:42:43 -05:00
bergquist
2bdeb78885
style(docker): remove comments
2016-11-28 18:48:34 +01:00
bergquist
20df0aafc2
tech(docker): adds docker fig for elastic 5
2016-11-28 18:43:26 +01:00
bergquist
ab2f109443
fix(config): error message for broken config file
...
closes #6731
2016-11-28 17:55:18 +01:00
Torkel Ödegaard
a2d1cc1a46
fix(css): minor style fix
2016-11-28 09:39:07 -05:00
Pavlos Daoglou
0064331bbf
[6679] Check if org exists before delete it
2016-11-28 00:09:01 +02:00
bergquist
b2edcd8cfd
tech(docs): use relref for links
2016-11-27 20:22:29 +01:00
bergquist
ce64a0173c
docs(datasource): add root datasource page
2016-11-27 20:05:35 +01:00
bergquist
3475ff2d81
docs(http): moves overview content to /http_api/
...
ref #6719
2016-11-27 17:09:56 +01:00
bergquist
e3ad740b49
docs(changelog): add note about closing #6701
2016-11-27 16:56:31 +01:00
bergquist
bdfb773a98
fix(alerting): fixes broken no_value evaluator
...
closes #6701
2016-11-27 16:53:29 +01:00
bergquist
583de8e0e0
docs(graph): remove unused headers
2016-11-27 16:10:16 +01:00
bergquist
adc1bd3dea
docs(graph): moves thresholds to display tab
...
closes #6703
2016-11-27 16:07:41 +01:00
bergquist
7bc1c3cc1c
feat(cloudwatch): make it possible to reset keys
...
closes #6697
2016-11-24 16:37:33 +01:00
bergquist
3d21f06d5b
tech(cloudwatch): store keys in secure json blob
2016-11-24 14:16:52 +01:00
bergquist
0ea6537916
tech(cloudwatch): refactoring
2016-11-24 14:00:05 +01:00
bergquist
f7e12e5f93
test(cloudwatch): fixes failing tests
2016-11-24 14:00:05 +01:00
bergquist
1695aece0c
feat(cloudwatch): add authtype dropdown to config page
2016-11-24 14:00:05 +01:00
bergquist
64784db870
feat(cloudwatch): adds access and secret key to edit config page
2016-11-24 14:00:05 +01:00
bergquist
c3075a9bd1
docs(changelog): add note about solving sync problem for alerts
2016-11-24 13:59:52 +01:00
Torkel Ödegaard
2f354ed926
fix(getting started panel): some more work on this, #6466
2016-11-24 13:58:51 +01:00
Carl Bergquist
42f522fe97
Merge pull request #6692 from grafana/feature/tls-client-auth
...
Feature/tls client auth
2016-11-24 13:58:08 +01:00
Daniel Lee
ad8f06f87f
feat(changelog): adds TLS Client auth
2016-11-24 13:57:19 +01:00
bergquist
2bbe3d56bc
docs(alerting): add info about alerting metrics
2016-11-24 13:45:24 +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
