IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-02 13:39:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,083 Commits 5,123 Branches 538 Tags 1.8 GiB
a9c0f66cda
Commit Graph

9083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
a9c0f66cda fix(influxdb): Fix for Ad-Hoc Filters variable & changing dashboards, fixes #6821 2016-12-05 11:04:05 +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
f7dced3067 update to version 4.0.1 2016-12-02 16:33:00 +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
a73bebbf3d tech(build): update publish script for 4.0.x release 2016-11-29 18:18:44 +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
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
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
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
c3075a9bd1 docs(changelog): add note about solving sync problem for alerts 2016-11-24 13:59:52 +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
Joe Lanford
56b7e2dfaf Added support for TLS client auth for datasource proxies (#5801) 2016-11-24 13:22:25 +01:00
Torkel Ödegaard
ad7ae1b912 fix(graph): Fixed tooltip date header visible when x-mode was set to series, fixes #6364 2016-11-24 13:16:46 +01:00
bergquist
421c1eed82 fix(dashboard): fixes bug when saving dashboards 2016-11-24 11:22:13 +01:00
Torkel Ödegaard
d9cf6a958b fix(unsaved changes): You now navigate to the intended page after saving in the unsaved changes dialog fixes #6675 2016-11-24 11:06:09 +01:00
Ben RUBSON
614bd7f1e8 Sort series by yaxis by default (#6683) 
* Sort series by yxis by default

* Sort series by yxis by default

* Sort series by yxis by default
 2016-11-24 10:24:49 +01:00
bergquist
6081c6cb61 docs(http_api): convert to new docs format 2016-11-24 10:16:24 +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
223f2320eb fix(streaming): clear data stream on subject completion 2016-11-23 17:12:30 +01:00
Torkel Ödegaard
cf751c256b fix(graph): fixed order of graph tooltip when sort order was none, fixes #6648 2016-11-23 17:08:14 +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