IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 08:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,267 Commits 1,121 Branches 715 Tags
cbf0d571f5d460936d1455f5ddc6e1ba08876cf2
Commit Graph
1914 Commits
Author SHA1 Message Date
bergquist ba7a990f86 tech: bump version in server cli 2016-12-09 12:30:36 +01:00
Torkel Ödegaard 22bf6420f1 Merge branch 'master' of github.com:grafana/grafana 2016-12-08 10:25:26 +01:00
Torkel Ödegaard 05772b30d7 feat(ux): completed work on getting started panel, #6466 2016-12-08 10:25:05 +01:00
Torkel Ödegaard dee6b7d150 Merge branch 'master' into getting-started-panel 2016-12-08 08:51:40 +01:00
bergquist 8ee85626f2 fix(api): return correct json info after updating datasource 
closes #6869
 2016-12-07 18:09:17 +01:00
bergquist 2bdd2a59cb test(alerting): improve naming for test scenario 2016-12-07 15:19:58 +01:00
Carl Bergquist 0294446af9 Merge pull request #6856 from kylemcc/opsgenie-alerting 
alerting: add support for OpsGenie
 2016-12-07 11:23:54 +01:00
Carl Bergquist 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
Kyle McCullough 4ef940482c alerting: add support for OpsGenie 2016-12-06 14:48:13 -06:00
bergquist 8f1ed07275 metrics: 64bit fields should come first in structs 
https://golang.org/pkg/sync/atomic/#pkg-note-BUG
 2016-12-06 09:08:51 +01:00
jifwin e73b82d54f Disable web-security for phantomjs rendering (#6469) 2016-12-06 08:37:36 +01:00
Mitsuhiro Tanda be26c017f6 (cloudwatch) percentile support (#6634) 
* support extended statistics

* handle different response format for extended statistics
 2016-12-06 08:12:30 +01:00
Torkel Ödegaard 88e1d56bc2 fix(logging): added extra logging when default config file is not found (ie homepath is not correct), fixes #6829 2016-12-06 07:36:10 +01:00
Torkel Ödegaard 1f50c6d76f Merge branch 'v4.0.x' 2016-12-05 11:20:14 +01:00
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 d1feaaf4f3 Merge branch 'v4.0.x' 2016-12-05 10:54: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
bergquist 6c9cf87080 feat(alerting): calculate avg of valid points 2016-12-02 23:44:14 +01:00
bergquist c9b7f8603e tech(): replace spaces to handle input more graceful 2016-12-02 23:43:02 +01:00
bergquist 9dd6cf45ac feat(webhook): adds alert rule message to webhook 
close #6807
 2016-12-02 22:24:36 +01:00
bergquist f70d7ff3a3 fix(influxdb): align tsdb.influxdb with dataproxy 
ref #6784
 2016-12-02 21:10:29 +01:00
bergquist b4b7156f42 fix(webdav): adds missing auth headers 
closes #6779
 2016-12-02 16:20:15 +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
stuart nelson 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
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
fg2it 834e3f1c29 swap member declaration in StandardGauge to avoid problem with atomic on arm and x86-32 2016-11-30 21:57:18 +00:00
Carl Bergquist 3c662ade8c Merge pull request #6698 from grafana/cloudwatch_configurable_keys 
Cloudwatch configurable keys from config page.
 2016-11-29 23:37:13 +01:00
bergquist 83e90325c9 chore(victorops): remove unused code 2016-11-29 22:26:42 +01:00
bergquist a6ea2f4fdb Merge branch 'victorops' of https://github.com/ichekrygin/grafana into ichekrygin-victorops 2016-11-29 22:22:25 +01:00
Carl Bergquist 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
bergquist 253324fc32 style(sqlstore): remove comment 2016-11-29 21:24:45 +01:00
Carl Bergquist 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
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 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
bergquist ab2f109443 fix(config): error message for broken config file 
closes #6731
 2016-11-28 17:55:18 +01:00
Pavlos Daoglou 0064331bbf [6679] Check if org exists before delete it 2016-11-28 00:09:01 +02:00
bergquist bdfb773a98 fix(alerting): fixes broken no_value evaluator 
closes #6701
 2016-11-27 16:53:29 +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 64784db870 feat(cloudwatch): adds access and secret key to edit config page 2016-11-24 14:00:05 +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