Alexander Zobnin
f0816b37bd
rename annotation_category to category
2017-04-17 18:53:10 +03:00
Dan Cech
a64e000f1a
process this.target separately to fix issues with tests
2017-04-17 11:10:55 -04:00
Dan Cech
715453204e
make sure graphite queries containing references are properly updated
2017-04-17 10:47:25 -04:00
Alexander Zobnin
5df82be290
create-annotations: fix missing lodash import
2017-04-17 11:37:23 +03:00
Thomas Szymanski
f2dffeb543
Influxdb datasource: fix language in stacking helpful info section ( #8134 )
2017-04-16 11:56:29 +02:00
Torkel Ödegaard
fa2a7db657
ux: create annotations
2017-04-14 23:10:56 +02:00
Torkel Ödegaard
03ef1fd758
refactoring: event / annotation handling in graph panel broken out
2017-04-14 22:56:01 +02:00
Torkel Ödegaard
60ef7d8768
Merge branch 'master' into create-annotations
2017-04-14 22:36:34 +02:00
Torkel Ödegaard
aa47b9bf5c
refactoring: simplified backend_srv and subUrl handling, #8122
2017-04-14 19:01:08 +02:00
Torkel Ödegaard
b77991f69b
refactoring: minor changes to #8122
2017-04-14 16:00:52 +02:00
Dan Cech
f490c5f12c
use X-Grafana-Org-Id header to ensure backend uses correct org ( #8122 )
2017-04-14 15:47:39 +02:00
Ivan Babrou
fb163450a5
Change prometheus semantics from step to min step ( #8073 )
...
Previously `Step` parameter would set a hard value for any zoom level.
Now it's renamed to `Min step` and sets the minimal value of `step` parameter
to Prometheus query. User would usually want to set it to the scraping interval
of the target metric to avoid having shap cliffs on graphs and extra load
on Prometheus. Actual `step` value is calculated as the minimum of automatically
selected step (based on zoom level) and user provided minimal step. If user
did not provide the step, then automatic value is used as is.
Example bahavior for `60s` scrape intervals:
* `5s` automatic interval, no user specified min step:
* Before: `step=5`
* After: `step=5`
* `5s` automatic interval, `1m` user specified min step:
* Before: `step=5`
* After: `step=60`
* `5m` automatic interval, `1m` user specified min step:
* Before: `step=60` (not really visible, too dense)
* After: `step=300` (automatic value is picked)
See:
* https://github.com/grafana/grafana/issues/8065
* https://github.com/prometheus/prometheus/issues/2564
2017-04-14 14:51:22 +02:00
Torkel Ödegaard
a151de1d37
progess on adding annotations
2017-04-14 14:43:06 +02:00
Torkel Ödegaard
0335c1f368
ux: updated styles a bit
2017-04-14 13:08:03 +02:00
Torkel Ödegaard
ea92ddccb3
create annotations progress
2017-04-14 12:46:02 +02:00
Torkel Ödegaard
ff426ae9a3
more work on annotations
2017-04-14 12:23:32 +02:00
Torkel Ödegaard
dbe5480edc
create annotations work
2017-04-14 11:41:02 +02:00
Torkel Ödegaard
2fce88ee62
ux: popover forms
2017-04-14 10:18:49 +02:00
Dan Cech
3a607f96a3
fix bug in log sprintf calls ( #8124 )
2017-04-14 07:45:36 +02:00
Torkel Ödegaard
c68fffcd6d
ux: popover forms
2017-04-13 20:28:13 +02:00
Torkel Ödegaard
2f61fc6afe
ux: made progress on popover forms
2017-04-13 18:39:49 +02:00
Torkel Ödegaard
dbeeb32ab6
Merge branch 'master' into popover-forms
2017-04-13 16:22:08 +02:00
Alexander Zobnin
ab99a7c1c7
graph(create annotation): add initial annotation_category table
2017-04-13 16:57:22 +03: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
Alexander Zobnin
2142323da9
graph(create annotation): refactor, AddAnnotationModalCtrl
2017-04-12 21:07:39 +03:00
Alexander Zobnin
17d3970673
graph(create annotation): push one annotation with time from and time to
2017-04-12 21:04:18 +03:00
Alexander Zobnin
ef99ff0ad7
graph(create annotation): use single description for range
2017-04-12 20:37:33 +03:00
Alexander Zobnin
8a1c35e1c2
graph(create annotation): refactor, fix two modal after range selection
...
bind create annotation handler directly to plotclick event, not to global graph-click
2017-04-12 20:27:32 +03:00
Torkel Ödegaard
de21be30d2
ux: working on how to show form in popover
2017-04-12 17:28:32 +02:00
Alexander Zobnin
eeb998d712
Merge remote-tracking branch 'upstream/create-annotations' into create-annotations
2017-04-12 17:36:40 +03: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
Alexander Zobnin
aff6aa081c
Merge remote-tracking branch 'upstream/create-annotations' into create-annotations
2017-04-12 16:20:36 +03:00
Alexander Zobnin
d2f3d7d138
graph(add annotation): get alerts for all panels
2017-04-12 16:06:48 +03: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
