Torkel Ödegaard
4cc878b56d
build: fixed build
2017-10-02 17:10:23 +02:00
Torkel Ödegaard
a02cac2126
refactoring: minor refactoring of PR #8916
2017-10-02 16:45:25 +02:00
Torkel Ödegaard
42a0e9ebdf
Merge branch 'day_rounding' of https://github.com/ctide/grafana into ctide-day_rounding2
2017-10-02 16:20:23 +02:00
Torkel Ödegaard
03a88206a3
Merge branch 'master' of github.com:grafana/grafana
2017-10-02 15:30:14 +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
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
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
Torkel Ödegaard
7aa753a25f
tech: migrating elasticsearch to typescript
2017-09-28 12:52:39 +02:00
Patrick O'Carroll
0d5540ca09
cleaned up html/sass and added final touches
2017-09-28 09:41:33 +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
Torkel Ödegaard
7b42e13c79
typescript: stricter typescript option
2017-09-26 11:24:58 +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
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
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
Alexander Zobnin
54f0650321
Remove alert thresholds on panel duplicate, issue #9178 ( #9257 )
2017-09-15 13:34:31 +02:00
Torkel Ödegaard
1a53d6453b
Merge branch 'v4.4.x'
2017-09-13 10:02:04 +02:00
Torkel Ödegaard
73248d6687
fixes for metrics tab when data source was not found
2017-09-13 09:48:50 +02:00
Torkel Ödegaard
f6100dd8eb
ux: success/error alerts refactoring, #9214
2017-09-12 09:05:32 +02:00
Patrick O'Carroll
90602942f5
New alert design ( #9214 )
...
* ux: updated alert design
* fixed bg-color for alerts
* more changes to alerts, index fixed
2017-09-12 08:01:44 +02:00
Torkel Ödegaard
2953d64429
prometheus: minor update to focus editor PR, #9201
2017-09-08 11:43:29 +02:00
Torkel Ödegaard
2fc67da69a
Merge branch 'metrics-tab-v3'
2017-09-04 13:27:44 +02:00
Torkel Ödegaard
6e4090abf2
feat: finished work on the interval changes #9161
2017-09-04 13:27:28 +02:00
Torkel Ödegaard
07e192ff47
change: more work on changing default group by time interval to min interval setting
2017-09-01 15:57:02 +02:00
Jesse White
91fb3f2224
fix: cancel the initial timer when changing the auto-refresh interval, fixes #9139 ( #9140 )
2017-09-01 07:19:51 +02:00
Torkel Ödegaard
eb0f5cc900
ux: progress on metrics tab changes
2017-08-31 16:38:49 +02:00
Torkel Ödegaard
84d4958a3c
plugin change: make interval, cache timeout & max data points options in plugin.json, remove query.options component feature, add help markdown feature and toggle for data sources
2017-08-31 14:05:52 +02:00
Torkel Ödegaard
9b60a63778
ux: metrics tab v3
2017-08-30 16:39:00 +02:00
Daniel Lee
abeaef71cc
DashExport: fix View JSON in export menu
...
ref #9002
2017-08-30 09:56:49 +02:00
Torkel Ödegaard
546f903141
ds: minor fix that resets data source model when switching data source type
2017-08-28 15:29:31 +02:00
Torkel Ödegaard
3b9fbd60d8
ux: fix for showing pending invitations tab, fixes #9094
2017-08-28 09:52:53 +02:00
Daniel Lee
bf4ffe41b0
Merge branch 'v4.4.x'
2017-08-23 15:19:51 +02:00
Daniel Lee
e763104a6f
csv: add toggle for export to Excel
...
Adds back feature that adds 'sep=;' text that excel needs in a csv file.
Also adds toggle to make this optional if exporting to other spreadsheet
programs. Fixes #9083 .
2017-08-23 15:17:53 +02:00
Torkel Ödegaard
4f9fbcc211
dataproxy: added caching of datasources when doing data proxy requests, #9078
2017-08-23 13:31:26 +02:00
Torkel Ödegaard
d4dd0222fa
fix: prometheus does not have two editor modes, fixes #9025
2017-08-11 12:33:56 +02:00
Torkel Ödegaard
d2437d3cf1
fix: ad-hoc filters now works with data source variables, fixes #8052
2017-08-10 12:04:46 +02:00
Daniel Lee
1105bb371f
mysqlds: adds support for template variables
...
Fixes #8855
2017-08-09 19:32:53 +02:00
Daniel Lee
59513ff963
tempvar: bug fix for duplicate template var
...
and a fix for when selecting the same value twice in
a template variable if it is not multi select. It threw an
exception on the second selection
2017-08-09 14:28:23 +02:00
Torkel Ödegaard
668cb3c1ef
Merge branch 'v4.4.x'
2017-08-09 10:37:06 +02:00
Torkel Ödegaard
e8a20643d6
feat: store last seen date for users and present in stats and user lists, closes #9007
2017-08-09 10:36:41 +02:00
Chris Burkhart
3e0b92d6fe
Enable datasources to be able to round off to a UTC day properly
2017-08-08 09:34:41 -07:00
Torkel Ödegaard
68c4ce34d5
fix: templating issue with data source variables, can now be used right away in other query variables and panels (without page reload), fixes #7510
2017-08-08 17:08:35 +02:00
