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
bergquist
02dc51b1b6
docs(influxdb): typo
2016-11-23 07:15:34 +01:00
Carl Bergquist
78ce29b8f1
Merge pull request #6671 from peregrinogris/patch-2
...
Fix typo in Basic Concepts
2016-11-23 06:30:44 +01:00
Hernán Rodríguez Colmeiro
e7e83a71a6
Fix typo in Basic Concepts
2016-11-22 21:47:59 -03:00
bergquist
56156fcd7f
feat(alerting): add median reducer to frontend
2016-11-22 14:35:26 +01:00
Torkel Ödegaard
2a33594c02
fix(templating): fixed duplicate button bug, fixes #6652
2016-11-22 14:20:24 +01:00
Torkel Ödegaard
34790e1fab
fix(dashboard): minor fix to schema upgrade when schemaVersion is not correct, fixes #6650
2016-11-22 14:20:24 +01:00
bergquist
6882dcfb99
feat(alerting): add backend support for median reducer
2016-11-22 14:09:35 +01:00
Mitsuhiro Tanda
51f80affe3
(cloudwatch) update aws-sdk-go to v1.5.8 ( #6658 )
...
* (cloudwatch) upgrade aws-sdk-go v1.5.8
* (cloudwatch) remove non-required aws-sdk-go part
* add go-ini
2016-11-22 13:38:11 +01:00
bergquist
50811c80ea
fix(alerting): fixes bug that prevents noData from triggering
...
closes #6631
2016-11-22 11:47:52 +01:00
bergquist
d73620f304
docs(issue_template): add note about alerting
2016-11-22 08:31:45 +01:00
bergquist
41a1ec29e7
docs(readme): add link to whats new in grafana 4
2016-11-21 14:01:41 +01:00
Torkel Ödegaard
a3d5b4bf25
Update CHANGELOG.md
2016-11-21 11:51:20 +01:00
Torkel Ödegaard
092f0c4b62
docs(): fixed windows link
2016-11-21 10:58:45 +01:00
Torkel Ödegaard
a5c0295a0e
docs(): updated doc download links
2016-11-21 10:18:43 +01:00
Torkel Ödegaard
c643466d57
bumped version to v4-beta2
2016-11-21 09:51:59 +01:00
bergquist
2b6013ce81
fix(notifications): failed image upload should not stop notification
...
closes #6638
2016-11-21 09:47:59 +01:00
Torkel Ödegaard
6fa4b8c0b6
Merge branch 'master' of github.com:grafana/grafana
2016-11-21 09:42:46 +01:00
Torkel Ödegaard
8d80812601
Merge branch 'issue-6566' of https://github.com/benrubson/grafana into benrubson-issue-6566
2016-11-21 09:39:35 +01:00
benrubson
e71114f4fb
Come back to #6287 for graph_tooltip.js
...
as it is an only one loop solution
2016-11-19 09:12:10 +01:00
benrubson
9797845460
Typo
2016-11-18 19:14:12 +01:00
benrubson
0034b6ede7
Highlight correct point when series has null values
2016-11-18 18:49:20 +01:00
benrubson
1eb0ea3450
Correctly stack series with null and missing values
2016-11-18 18:14:40 +01:00
benrubson
becb6303e5
Revert #6287 for graph_tooltip.js
2016-11-18 17:50:54 +01:00
bergquist
5dea0fda51
fix(settings): remove nil pointer exception
2016-11-18 16:43:14 +01:00
benrubson
850d39fc50
Revert #6287 for jquery.flot.stack.js
2016-11-18 16:32:00 +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
b9cfb19ab8
changelog(): added entry for PR #6579
2016-11-17 15:50:00 +01:00
Torkel Ödegaard
e34bf9a1fa
Merge branch 'utkarshcmu-or_alerting'
2016-11-17 15:49:52 +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
Torkel Ödegaard
98d1748e43
fix(templating): work on fixing exporting issues when using templating variables, like data source variables, and panel repeats, requires more work #6189
2016-11-17 12:32:11 +01:00
Torkel Ödegaard
9d5928ddd6
feat(templating): don't persist template variable options when variable has refresh enabled, closes #6586
2016-11-17 11:38:06 +01:00
Torkel Ödegaard
eafe0d6bfa
fix(templating): fixed issue when adding template variable, fixes #6622
2016-11-17 11:28:33 +01:00
