Torkel Ödegaard
03a88206a3
Merge branch 'master' of github.com:grafana/grafana
2017-10-02 15:30:14 +02:00
Torkel Ödegaard
d38c891fac
merge with master
2017-10-02 14:14:45 +02:00
Torkel Ödegaard
ae14655749
plugins: expose datemath to plugins as well, fixes zabbix plugin
2017-10-02 13:39:39 +02:00
Patrick O'Carroll
bd348e16bb
redesigned dashboard links settingd, fixed a misspelling in rows and added fixed width to buttons ( #9397 )
2017-10-02 13:04:48 +02:00
bergquist
cb0ded069a
playlist: play and edit should use same width
2017-10-02 09:58:58 +02:00
Torkel Ödegaard
1dea7dab2a
shore: fixed html indentation, #9368
2017-10-02 08:51:45 +02:00
Torkel Ödegaard
a22dded6fa
Merge branch 'update-alert-lists' of https://github.com/Ijin08/grafana into Ijin08-update-alert-lists
2017-10-02 08:43:56 +02:00
Torkel Ödegaard
fea741d7c2
shore: minor cleanup
2017-10-01 20:35:01 +02:00
Torkel Ödegaard
0c86241c5b
Webpack ( #9391 )
...
* webpack poc, this is not going to work for plugins, dam
* tech: webpack and systemjs for plugins starting to work
* tech: webpack and systemjs combo starting to work
* tech: webpack + karma tests progress
* tech: webpack + karma progress
* tech: working on tests
* tech: webpack
* tech: webpack + karma, all tests pass
* tech: webpack + karma, all tests pass
* tech: webpack all tests pass
* webpack: getting closer
* tech: webpack progress
* webpack: further build refinements
* webpack: ng annotate fixes
* webpack: optimized build fix
* tech: minor fix for elasticsearch
* tech: webpack + ace editor
* tech: restored lodash move mixin compatability
* tech: added enzyme react test and upgraded to react v16
* tech: package version fix
* tech: added testdata to built in bundle
* webpack: sass progress
* tech: prod & dev build is working for the sass
* tech: clean up unused grunt stuff and moved to scripts folder
* tech: added vendor and manifest chunks, updated readme and docs
* tech: webpack finishing touches
2017-10-01 20:02:25 +02:00
Matthew McGinn
00726e93eb
adding support for token-based slack file.upload API call for posting images to slack
2017-09-30 21:20:20 -04:00
Carl Bergquist
cabb21317f
Merge pull request #8050 from mtanda/cloudwatch_alert
...
(cloudwatch) alerting
2017-09-29 13:36:36 +02:00
Carl Bergquist
7d2b989459
Merge pull request #9386 from shanhuhai5739/master
...
add diff and pdiff for conditions
2017-09-29 13:16:03 +02:00
coral
68ed4d45fa
change pdiff to percent_diff for conditions
2017-09-29 18:14:17 +08:00
Daniel Lee
992cc1b680
panel: rename label on csv export modal
2017-09-29 11:32:13 +02:00
coral
9e48d54465
add diff and pdiff for conditions
2017-09-29 17:20:02 +08:00
Mitsuhiro Tanda
5850ae51b1
fix, add targetContainsTemplate()
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
468e8c13ee
move extend statistics handling code to backend
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
e1fe15e094
fix annotation query
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
bf5268c0b4
fix time
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
d98d8a404f
fix dimension convertion
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
c140d7aa06
re-implement annotation query
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
8243ac39c2
fix parameter format
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
4b34ff5b83
refactor cloudwatch frontend code
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
e4de6332de
refactor cloudwatch frontend code
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
ea704306a0
fix test
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
1dcc51adce
re-implement dimension_values()
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
78e3556e95
remove performEC2DescribeInstances()
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
8fba6dcb0d
re-implement ec2_instance_attribute()
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
cf23734d7d
re-implement ebs_volume_ids()
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
01d2aa8af0
fix test
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
fe3d3bc384
porting other suggestion
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
feed90c0e2
re-implement get regions
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
62d84c1e14
(cloudwatch) move query parameter to 'parameters'
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
83b79dd624
fix test
2017-09-29 13:44:00 +09:00
Mitsuhiro Tanda
728e96e134
fix invalid query filter
2017-09-29 13:44:00 +09:00
Mitsuhiro Tanda
39607d09d7
(cloudwatch) alerting
2017-09-29 13:44:00 +09:00
Yago Nobre
9c026a8e04
add brazil currency
2017-09-28 14:18:14 -03:00
Torkel Ödegaard
73295ab3ed
tech: upgrade of systemjs to 0.20.x working
2017-09-28 14:08:59 +02:00
Torkel Ödegaard
9bfda72a55
tech: reverted to systemjs
2017-09-28 13:06:23 +02:00
Torkel Ödegaard
7aa753a25f
tech: migrating elasticsearch to typescript
2017-09-28 12:52:39 +02:00
Torkel Ödegaard
c5e6344a2c
fixes
2017-09-28 11:05:14 +02:00
Torkel Ödegaard
5849fbf04e
Merge branch 'master' of github.com:grafana/grafana into develop
2017-09-28 10:37:57 +02:00
Torkel Ödegaard
487c475a1e
tech: systemjs upgrade
2017-09-28 10:37:33 +02:00
Patrick O'Carroll
0d5540ca09
cleaned up html/sass and added final touches
2017-09-28 09:41:33 +02:00
Torkel Ödegaard
9ee343f33d
tech: systemjs upgrade
2017-09-27 15:42:06 +02:00
Alin Sinpalean
bb8849785a
Have include intervalFactor in its calculation, so always equal to the step query parameter.
2017-09-27 14:20:51 +02:00
Alin Sinpalean
25a6ed8718
Merge remote-tracking branch 'upstream/master' into adjust_interval_variable_with_min_step
2017-09-27 11:37:14 +02:00
bergquist
5373a6027c
alertlist: toggle play/pause button
...
closes #9355
2017-09-27 10:49:39 +02:00
Patrick O'Carroll
8615912018
updated css and html for recent state changes for alert lists
2017-09-27 10:38:01 +02:00
chrisrd
0e5e2f3fb9
Fix export_modal message ( #9353 )
...
Remove duplicate "to", and "others" is plural not possessive.
2017-09-27 09:46:56 +02:00
Alin Sinpalean
f25aeadf21
Resolve merge conflicts with remote/master.
2017-09-26 17:55:30 +02:00
Carl Bergquist
da3aea5e0a
Merge pull request #9186 from mtanda/prometehus_instant_query2
...
(prometheus) instant query support
2017-09-26 14:37:10 +02:00
Torkel Ödegaard
7b42e13c79
typescript: stricter typescript option
2017-09-26 11:24:58 +02:00
Carl Bergquist
632ae0986c
Merge pull request #9320 from xiahuibing/patch-1
...
Update _navbar.scss
2017-09-22 13:06:11 +02:00
Torkel Ödegaard
c0c86c1138
tech: remove bower and moved remaining bower dependencies to npm
2017-09-22 09:47:25 +02:00
Torkel Ödegaard
18337f610d
Merge branch 'master' into develop
2017-09-22 08:42:07 +02:00
Torkel Ödegaard
6aad2a5b2d
tech: cleanup and fixed build issue
2017-09-21 21:12:49 +02:00
Torkel Ödegaard
f0e0e61809
tech: upgraded angularjs and moved dependency from bower to npm, closes #9327
2017-09-21 20:58:32 +02:00
Torkel Ödegaard
491fa6cad8
tech: more tslint rules
2017-09-21 17:23:31 +02:00
Torkel Ödegaard
b8d9722b4f
tech: removing unused variables from typescript files, and making tslint rules more strict
2017-09-21 16:40:18 +02:00
Torkel Ödegaard
adda84d124
tech: removed test component
2017-09-21 14:05:24 +02:00
Torkel Ödegaard
837beda155
Merge branch 'react-poc'
2017-09-21 13:59:26 +02:00
Torkel Ödegaard
9500eb8aaa
ux: minor singlestat update
2017-09-21 13:59:21 +02:00
Torkel Ödegaard
1887c4f279
singlestat: minor change
2017-09-21 13:59:21 +02:00
Patrick O'Carroll
de17dcf3b0
Singlestat time ( #9298 )
...
* Added a timestamp option to single stat
* can now choose last time as value
* Finished last_time so it formats correctly, updated value stat
* fixed som issues, but still issue with testing
* Clean up after fake clock in test
* timezone-issue fix, fake time for from now test
* fix for timedifference
2017-09-21 13:34:51 +02:00
Torkel Ödegaard
fed35909cc
tech: progress on react poc
2017-09-21 13:32:57 +02:00
xiahuibing
416510773b
Update _navbar.scss
...
line66 and line118 : "min-height:: $navbarHeight;" has double “:”
2017-09-21 16:40:49 +08:00
Gordon McGuire
5e013f82b4
fix: close for 'Unsaved Changes' modal, #9284 ( #9313 )
...
Missing reference to the controller instance.
2017-09-21 09:05:59 +02:00
Alexander Zobnin
f8b8907cc4
Initial graphite tags support ( #9239 )
...
* graphite: initial seriesByTag() support
* graphite: groupByTags() function
* graphite: aliasByTags() function
* graphite: fix optional params update, issue #9238
* graphite: fix tag-related functions version
* graphite: add 1.1.x version to config
* graphite: fix seriesByTag() series parsing
2017-09-21 08:22:56 +02:00
Torkel Ödegaard
84b1519480
tech: initial react poc
2017-09-20 17:44:23 +02:00
Alexander Zobnin
fdec9a4daf
templating: fix dependent variable updating ( #9306 )
2017-09-19 20:35:48 +02:00
tamayika
bef4b9b3b0
Fix adhoc filters restoration ( #9303 )
2017-09-19 14:25:35 +02:00
Patrick O'Carroll
d6725d4fbe
updated error page html+css, added ds_store to ignore ( #9285 )
2017-09-18 14:04:55 +02:00
deep-42-thought
5749489e7e
public/app/plugins/panel/graph/specs/graph_specs.ts: relax tests to be "within" instead of "equal", so they won't fail on i686 ( #9286 )
2017-09-18 14:03:54 +02:00
Sven Nierlein
d0ddf76730
Fix path to icon ( #9276 )
...
grafana_mask_icon.svg is located in the img/ folder.
2017-09-18 12:54:20 +02:00
Torkel Ödegaard
41e01184aa
Merge branch 'master' into develop
2017-09-18 12:32:29 +02:00
Andrew Prokhorenkov
00b18a8aea
addded mass units, #9265 ( #9273 )
2017-09-18 11:13:56 +02:00
Ryan Patterson
a20c419583
Fully fill out nulls in cloudfront data source ( #9268 )
...
Summary:
Previously, cloudwatch data sources would only fill in a single null value if
there was missing data. This results in behavior described in #9267 . This
resolves that issue by filling the entire missing period with null values. The
null values can then be interpreted as normal by the graphing frontend.
Test Plan:
Used on a data source that had missing data for many consecutive periods.
Ensured that the graph remained at 0 across the entire window.
2017-09-18 11:12:52 +02:00
Torkel Ödegaard
7a80a6627a
Merge branch 'reduce-package-size'
2017-09-18 09:09:38 +02:00
Andrew Prokhorenkov
8cdf12b694
add locale format
2017-09-15 17:26:18 +02:00
Alexander Zobnin
54f0650321
Remove alert thresholds on panel duplicate, issue #9178 ( #9257 )
2017-09-15 13:34:31 +02:00
Torkel Ödegaard
bbe191a975
graphite: do not show error for cancelled requests, fixes #9249
2017-09-15 09:59:23 +02:00
Torkel Ödegaard
f8326c29f9
mysql: fix query editor not showing issue, fixes #9247
2017-09-14 20:30:01 +02:00
Andrew Prokhorenkov
5b74bea476
add Ukrainian hryvnia sign
2017-09-14 19:06:25 +02:00
Torkel Ödegaard
210df23430
packaging: reducing package size be only including public vendor stuff we need
2017-09-14 17:33:58 +02:00
Daniel Lee
29de6387cb
plugins: add styles for ol tags in markdown
2017-09-13 17:13:53 +02:00
Torkel Ödegaard
a9e3130ef6
Merge branch 'master' into develop
2017-09-13 16:06:34 +02:00
Torkel Ödegaard
85bd1861d6
fix: improve behavior when switching back and forth between x-axis modes, fixes #9229
2017-09-13 14:38:22 +02:00
Torkel Ödegaard
1a53d6453b
Merge branch 'v4.4.x'
2017-09-13 10:02:04 +02:00
Torkel Ödegaard
10f058036c
Merge branch 'master' of github.com:grafana/grafana
2017-09-13 09:48:56 +02:00
Torkel Ödegaard
73248d6687
fixes for metrics tab when data source was not found
2017-09-13 09:48:50 +02:00
Mitsuhiro Tanda
5bdd554671
check args for query
2017-09-13 16:34:28 +09:00
Mitsuhiro Tanda
6bf8144793
add test for completer
2017-09-13 16:34:28 +09:00
Mitsuhiro Tanda
1a5e786467
fix
2017-09-13 16:34:28 +09:00
Mitsuhiro Tanda
56c0d91ee5
follow token name change
2017-09-13 16:34:28 +09:00
Mitsuhiro Tanda
d530ccff1c
(prometheus) support label value completion
2017-09-13 16:34:28 +09:00
Mitsuhiro Tanda
40b74e6664
(prometheus) support label name completion
2017-09-13 16:34:28 +09:00
Mitsuhiro Tanda
b349b3ef55
provide ace editor for external datasource plugin ( #9224 )
2017-09-13 09:29:53 +02:00
Alin Sinpalean
2a62374a61
Prometheus: Rework the interaction between auto interval (computed based on graph resolution), min interval (where specified, per query) and intervalFactor (AKA resolution, where specified, per query).
...
As a bonus, have and reflect the actual interval (not the auto interval), taking into account min interval and Prometheus' 11k data points limit.
2017-09-12 16:36:27 +02:00
Torkel Ödegaard
968ba30fa5
ux: increased code editor auto complete width from 320px to 550px, fixes #9203
2017-09-12 11:36:30 +02:00
