1f8f3ed038
style(api): extracts filter logic for mass pause
2016-12-16 15:19:13 +01:00
fb6aa0e026
feat(api): adds endpoint for mass pausing alerts
...
ref #6589
2016-12-16 15:00:58 +01:00
8fc6e4cfb0
fix(auth proxy, ldap): fixed so users cannot change password when ldap or auth proxy is enabled, fixes #2495 , do not allow user to change email or username depending on what property auth proxy is using, fixes #6903
2016-12-14 22:19:25 +01:00
330c1b945e
refactor(datasource): refactoring datasource secure json fields handling, #6697 , #6692
2016-12-14 21:06:10 +01:00
adb441e5c8
(format) run go fmt in pkg
2016-12-14 12:17:38 +09:00
96e8ecfa7b
feat(cli): adds command to reset admin password
...
closes #5479
2016-12-09 15:25:02 +01:00
22bf6420f1
Merge branch 'master' of github.com:grafana/grafana
2016-12-08 10:25:26 +01:00
05772b30d7
feat(ux): completed work on getting started panel, #6466
2016-12-08 10:25:05 +01:00
dee6b7d150
Merge branch 'master' into getting-started-panel
2016-12-08 08:51:40 +01:00
8ee85626f2
fix(api): return correct json info after updating datasource
...
closes #6869
2016-12-07 18:09:17 +01:00
2c7adccf12
Use cache for http.client in tsdb package. ( #6833 )
...
* datasource: move caching closer to datasource struct
* tsdb: use cached version of datasource http transport
closes #6825
2016-12-07 11:10:42 +01:00
be26c017f6
(cloudwatch) percentile support ( #6634 )
...
* support extended statistics
* handle different response format for extended statistics
2016-12-06 08:12:30 +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
3c662ade8c
Merge pull request #6698 from grafana/cloudwatch_configurable_keys
...
Cloudwatch configurable keys from config page.
2016-11-29 23:37:13 +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
7f7f080ad8
[5443] Check if title is empty before save a new dashboard
2016-11-29 12:25:20 +02:00
0064331bbf
[6679] Check if org exists before delete it
2016-11-28 00:09:01 +02: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
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
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
fd512457d8
Merge remote-tracking branch 'origin/master' into getting-started-panel-css2
2016-11-18 16:31:54 +01:00
62e8a039a1
refactor(alerting): refactoring PR for OR conditions, #6579
2016-11-17 15:48:15 +01:00
457ae74343
Merge branch 'or_alerting' of https://github.com/utkarshcmu/grafana into utkarshcmu-or_alerting
2016-11-17 14:43:24 +01:00
690868c837
Added firingEvalution to Rule test
2016-11-17 01:28:17 -08:00
e3564d12a1
fix(404): fixed 404 page
2016-11-16 17:09:00 +01:00
a353c8d1bb
added explicitly setting token as Bearer Type
2016-11-16 09:55:14 -05:00
fb57bf77da
ux(getting started): progress on getting started panel and persited help flag states, #6466
2016-11-09 10:41:39 +01:00
69ff13adce
add govcloud
2016-11-07 13:56:29 -05:00
d670f1b959
Merge pull request #6479 from utkarshcmu/playlist_bug
...
Removed playlist item when dashboard is deleted
2016-11-07 08:00:57 +01:00
2d19af601a
fix(alerting): various alerting fixes
2016-11-06 15:40:02 +01:00
c737704eeb
Removed playlist item when dashboard is deleted
2016-11-06 01:49:43 -08:00
2da2d5df56
Merge branch 'master' of github.com:grafana/grafana
2016-11-04 12:15:08 +01:00
7490c49f60
Alert un paused to pending state
2016-11-01 07:58:38 -07:00
2fbe8cde8a
Merge branch 'master' of github.com:grafana/grafana into dash-edit-mode
2016-10-29 11:50:57 +02:00
658fc1a67a
added hosted domain suppport to google oauth login ( #6372 )
2016-10-28 12:00:47 +02:00
