Torkel Ödegaard
dbeeb32ab6
Merge branch 'master' into popover-forms
2017-04-13 16:22:08 +02:00
Torkel Ödegaard
dd3e594dd7
fix: scroll issue and positioning of info-popover
2017-04-12 21:20:47 +02:00
Torkel Ödegaard
9c246ba301
docs: fixed http docs for alert notifications, fixes #8105
2017-04-12 20:57:22 +02:00
Torkel Ödegaard
de21be30d2
ux: working on how to show form in popover
2017-04-12 17:28:32 +02:00
Torkel Ödegaard
593b2ef866
annotation: added region support to annoations
2017-04-12 16:26:34 +02:00
Torkel Ödegaard
b867921b3b
annotation: cleanup
2017-04-12 15:49:59 +02:00
Torkel Ödegaard
0156a94a49
annotations: you can now read annoations via manually created annoation query
2017-04-12 15:46:41 +02:00
Torkel Ödegaard
78f4bd2de9
Merge branch 'create-annotations' of github.com:grafana/grafana into create-annotations
2017-04-12 15:01:31 +02:00
Torkel Ödegaard
752b42798a
annotations: added new options hide toggle, and show option
2017-04-12 15:01:17 +02:00
Alexander Zobnin
232513bb4e
graph(add annotation): refactor
...
pass ctrlKey and metaKey through flot events
2017-04-12 15:26:34 +03:00
Tyndie
20ac8bf83e
Set .go tab size to 4 in .editorconfig ( #8099 )
...
Tab size was added as 2 in .editorconfig but a tab size of 4 is used
throughout go code base.
This can cause editors such as vscode to automatically reformat open .go
files to tab size 2 from 4.
2017-04-12 10:59:50 +02:00
Torkel Ödegaard
8eb112d119
plugins: refactoring builtIn data source concept, now means data source plugins that you do not need to add via data sources page, that is automatically added as selectable data source, #8095
2017-04-12 08:23:44 +02:00
Torkel Ödegaard
e80494390a
Merge branch 'always_displayed_datasources' of https://github.com/ctide/grafana into ctide-always_displayed_datasources
2017-04-12 07:44:59 +02:00
Torkel Ödegaard
b3df1aa9bd
org: fixed issue with orgId query param redirect handling when grafana is under subpath and reverse proxy, fixes #8089
2017-04-12 07:11:08 +02:00
Mitsuhiro Tanda
d2bf2e86ed
upgrade to aws-sdk-go v1.8.11 ( #8091 )
...
* upgrade to aws-sdk-go v1.8.11
* fix test
2017-04-12 06:40:44 +02:00
Torkel Ödegaard
09cec3118f
docs: updated go and node version requirements for building, fixes #8097
2017-04-12 06:39:26 +02:00
Chris Burkhart
d12dc2bfa7
Add alwaysDisplayed option to datasource plugins, this will allow it to show up as an option to select when adding queries to a panel without actually adding it as a datasource.
2017-04-11 13:47:53 -07:00
Torkel Ödegaard
07466b6725
security: fixed returning info on weither user exists or not in password reset call, fixes #7619
2017-04-11 16:50:16 +02:00
Torkel Ödegaard
a109049de4
smpt: Added smtp docker block
2017-04-11 16:41:07 +02:00
Torkel Ödegaard
89a7c2c686
influxdb: validate database exist when saving data source, fixes #7864
2017-04-11 15:05:30 +02:00
Torkel Ödegaard
83e0f69cde
Merge branch 'master' of github.com:grafana/grafana
2017-04-11 14:43:40 +02:00
Torkel Ödegaard
9099119f62
grunt: minor watch fix
2017-04-11 14:42:35 +02:00
Torkel Ödegaard
9bdcc4ec5f
influxdb: holt winters edits
2017-04-11 14:40:08 +02:00
Torkel Ödegaard
e0640487df
Update CHANGELOG.md
2017-04-11 13:38:13 +02:00
Daniel Lee
3ca3c96226
profiling: adds profiling and tracing
...
If grafana-server binary is started with the -profile flag then
tracing will create a trace.out file and pprof data can be accessed
on the 6060 port.
A custom port for pprof profiling can be set with the -profile-port
flag.
2017-04-11 10:32:18 +02:00
Alexander Zobnin
f42202e665
Merge branch 'master' into graph-annotations
2017-04-11 10:27:37 +03:00
Alexander Zobnin
70bca219e3
graph(add annotation): Add keybinding for CTRL key
2017-04-11 10:24:21 +03:00
Alexander Zobnin
d553498a33
graph(add annotation): initial backend implementation #1286
2017-04-10 20:22:58 +03:00
Torkel Ödegaard
0384eecf5c
fix: minor fix for bug when saving alert with empty message, fixes #7927
2017-04-10 15:26:05 +02:00
Daniel Lee
2877ad1a7d
docs: manual installation of plugins
2017-04-10 15:01:40 +02:00
Alexander Zobnin
362860f687
graph(add annotation): able to select region (start and stop time) #1286
2017-04-10 12:45:08 +03:00
Davide Setti
997da1b266
fix a typo in the shortcut help modal ( #8078 )
...
Collapse all ros -> Collapse all rows
2017-04-10 10:10:32 +02:00
Torkel Ödegaard
337b3295bd
docs: updated changelog
2017-04-10 09:45:44 +02:00
Simen Bekkhus
21ae987bcd
If earlier dashboard refresh was supressed, force a new one on page becoming visible ( #8076 )
2017-04-10 09:43:35 +02:00
Alfred Krohmer
41171f8a5c
Add a link to a graph image in Pushover notifications ( #8075 )
2017-04-10 09:17:37 +02:00
Alexander Zobnin
32d34aed7a
graph: initial Add Annotation flow #1286
2017-04-08 19:44:40 +03:00
Torkel Ödegaard
efca9e904d
Merge branch 'mixed_typeahead' of https://github.com/mtanda/grafana into mtanda-mixed_typeahead
2017-04-07 12:17:19 +02:00
Torkel Ödegaard
1cd632cc43
plugins: added state property to plugins
2017-04-07 12:00:03 +02:00
Torkel Ödegaard
26804d630f
Merge branch 'master' into sql-proxy
2017-04-07 10:34:51 +02:00
Torkel Ödegaard
3b47efe70e
graph: minor change to histogram buckets input field
2017-04-07 10:16:57 +02:00
Torkel Ödegaard
7ec6e84fe8
adhocfilters: minor escape change
2017-04-07 10:08:16 +02:00
Alexander Zobnin
7e14797b10
graph: initial histogram support #600 ( #8053 )
...
* graph: initial histogram support #600
* graph histogram mode: add Bars number option
* graph histogram mode: fix X axis ticks calculation
* graph histogram mode: change bar style (align and width)
* refactor(graph): move histogram functions into separate module
* graph histogram mode: rename series to "count"
* graph histogram mode: fix errors if no data
* refactor(graph and heatmap): move shared code into app/core
* graph: add tests for histogram mode
2017-04-07 10:07:30 +02:00
tamayika
e6cc5df9d9
Fix restoration of ad-hoc variable value issue ( #8057 )
...
* Fix restoration of ad-hoc variable value issue
* Escape delimiters in ad-hoc variable URL
* Remove unnecessary newline
2017-04-07 09:31:36 +02:00
wrp
c219498aab
Fix typo: "your" -> "your're" ( #8064 )
2017-04-07 09:29:46 +02:00
Torkel Ödegaard
f5f0d94ad4
fix: temp/testing fix for hanging issue, #8033
2017-04-06 13:18:50 +02:00
Calle Pettersson
a79102b42d
Fix ldap ca_cert example/docs for proper syntax ( #8044 )
2017-04-06 09:53:11 +02:00
Alexander Zobnin
2b81bfe9bf
alerting: fix $timeFilter cannot be used twice ( #7969 ) ( #8037 )
2017-04-05 17:17:55 +02:00
Alexander Zobnin
308d46e4ef
Fix 8013 ( #8027 )
...
* Add @ngInject to HeatmapCtrl constructor, issue #8013
* Remove unused loadPluginCss
2017-04-04 11:02:25 +02:00
Torkel Ödegaard
48c4e549f5
Revert "support panel repeat for datasource template variable ( #7711 )"
...
This reverts commit 554f972a25
2017-04-04 09:28:33 +02:00
Torkel Ödegaard
dd800fd14d
fix: table panel could not show annotations due to bug introduced in 4.2, fixes #8023
2017-04-03 22:07:09 +02:00
