Commit Graph

19222 Commits

Author SHA1 Message Date
Erik Sundell
e73d363129 Merge remote-tracking branch 'origin/master' into reactify-stackdriver
# Conflicts:
#	public/app/core/angular_wrappers.ts
#	yarn.lock
2019-01-11 15:12:29 +01:00
Torkel Ödegaard
ba9d5115d2 Merge branch 'master' into kbn-formats-refactor 2019-01-11 14:33:04 +01:00
Erik Sundell
b596550210 use typings for ds and template srv 2019-01-11 13:53:04 +01:00
Torkel Ödegaard
9e6411bf4b value formats: another rename and updates code to use new valueFormats func 2019-01-11 13:31:25 +01:00
Hugo Häggmark
f5ae40cf54
Merge pull request #14811 from grafana/move-threshold-component-to-ui-components
Moved Thresholds and styles to grafana/ui/components
2019-01-11 12:14:09 +01:00
Hugo Häggmark
d97cd450c9 Merge 2019-01-11 11:41:08 +01:00
Torkel Ödegaard
8aae6e8c09 value formats: renamed folder 2019-01-11 11:31:40 +01:00
Hugo Häggmark
d2b71cff37 Reverted move of defaults for GaugePanelOptions 2019-01-11 11:25:49 +01:00
Torkel Ödegaard
bc78c8d56e
Merge pull request #14817 from grafana/grafana-ui/select
Migrate Select components to @grafana/ui
2019-01-11 11:13:12 +01:00
Erik Sundell
3871ef29f9 refactoring alias by 2019-01-11 10:29:53 +01:00
Dominik Prokop
391253ee2d Merge branch 'master' into grafana-ui/select 2019-01-11 09:52:26 +01:00
Dominik Prokop
537e2534a6 Move Select styles to grafana/ui 2019-01-11 09:50:05 +01:00
Torkel Ödegaard
11ad92c08e
Merge pull request #14831 from grafana/fix/time-range-overrides
Fix panel time overrides not being applied fully
2019-01-11 09:38:15 +01:00
Torkel Ödegaard
fda0f92cf9
Merge pull request #12991 from pgiraud/repeat_min_span
Repeating panels - Max per row
2019-01-11 09:31:21 +01:00
Torkel Ödegaard
5d53f7e68b
Merge pull request #14834 from grafana/14793/loading-placeholder-to-grafanaui
Loading placeholder to grafanaui
2019-01-11 09:25:34 +01:00
Hugo Häggmark
5ceedc4ac4 Moved defaultProps to ui/components 2019-01-11 09:16:53 +01:00
Torkel Ödegaard
6d669e2c74
Merge branch 'master' into 14793/loading-placeholder-to-grafanaui 2019-01-11 09:10:49 +01:00
Hugo Häggmark
0b8165fee2 Merge branch 'move-threshold-component-to-ui-components' of https://github.com/grafana/grafana into move-threshold-component-to-ui-components 2019-01-11 08:46:59 +01:00
Hugo Häggmark
c54ec5f52f Moved the rest of Threshold dependencies to ui/components 2019-01-11 08:30:30 +01:00
Hugo Häggmark
c05b92c2e0 Renamed Threshold files 2019-01-11 07:14:28 +01:00
Hugo Häggmark
0b6e21e9ac Renamed Thresholds to ThresholdsEditor 2019-01-11 07:12:53 +01:00
Hugo Häggmark
1581662a6c Moved Thresholds and styles to grafana/ui/components 2019-01-11 07:11:40 +01:00
Hugo Häggmark
dc9b83030f Removed default export for colors 2019-01-11 07:03:12 +01:00
Hugo Häggmark
6f2bbb7378 Fixed typings 2019-01-11 07:03:12 +01:00
Hugo Häggmark
37dae043d7 Small change in SeriesColorPickerPopoverProps 2019-01-11 07:03:12 +01:00
Hugo Häggmark
d376fae393 Moved colorpicker to ui/components 2019-01-11 07:03:12 +01:00
Peter Holmberg
2f0ab99ae5 Fixing test and small refactor 2019-01-10 22:15:37 +00:00
Peter Holmberg
08ac2959a4 Moving to grafana ui, fix issue with TestRuleResult 2019-01-10 21:47:09 +00:00
Torkel Ödegaard
7e106b0f49
Merge pull request #14805 from SamuelToh/11503_prevent_end_of_regexpr
11503: escape measurement filter regex value
2019-01-10 20:29:07 +01:00
Dominik Prokop
60fadcf1e5 Fix panel time overrides not being applied fully
When both relative and time shift were applied, only time shift was taken into consideration
2019-01-10 20:15:03 +01:00
Erik Sundell
b64115e5f5 access scope directly from this. update tests 2019-01-10 17:18:24 +01:00
Leonard Gram
0f82fffed6 build: makes sure all builds use the latest container. 2019-01-10 16:52:21 +01:00
Leonard Gram
cdfdc676ae changelog: docker images for arm. 2019-01-10 16:50:36 +01:00
Dominik Prokop
d322717f3e Renamed Select related components: Picker* to Select*, Option* to SelectOption* 2019-01-10 15:21:11 +01:00
Carl Bergquist
0a98306e4b
Merge pull request #14813 from bergquist/zero_frequency
Make sure that frequency is never set to zero
2019-01-10 15:20:01 +01:00
Leonard Gram
c22ef628f3 build: removes curl install from build. 2019-01-10 15:12:43 +01:00
Leonard Gram
a82f0ed393 build: tags arm as well as amd64 as latest. 2019-01-10 14:41:02 +01:00
Johannes Würbach
702d449001 Docker image for ARM 2019-01-10 14:41:02 +01:00
Dominik Prokop
53f0f08efa Fixing TS and updating snapshot 2019-01-10 14:24:24 +01:00
bergquist
fbb3ad5fc4 make sure frequency cannot be zero
frequency set to zero causes division by zero
panics in the alert schedular.

closes #14810
2019-01-10 14:17:10 +01:00
Erik Sundell
6a2f5eb61e refactoring. fix broken test 2019-01-10 13:49:11 +01:00
Dominik Prokop
7819529d45 Migrate Select components to @grafana/ui 2019-01-10 13:29:53 +01:00
Erik Sundell
5fed50713d provide angular directive scope props correctly 2019-01-10 12:02:38 +01:00
Daniel Lee
96759e39a6 docker: enable flux in influxdb docker block 2019-01-10 09:47:39 +01:00
Hugo Häggmark
5fc0766341 Moved Thresholds and styles to grafana/ui/components 2019-01-10 09:37:32 +01:00
Torkel Ödegaard
1dc1af7e00
Update README.md 2019-01-10 08:37:40 +01:00
Torkel Ödegaard
322a3efb25
Merge pull request #14779 from grafana/tooling/ignore-not-found-export-warnings
Removes unnecessary warnings from webpack output about missing exports
2019-01-10 07:25:35 +01:00
Torkel Ödegaard
4c42db9e95
Merge pull request #14804 from SamuelToh/4075_support_templatevar_on_alias_es_ds
4075: Interpolate tempvar on alias
2019-01-10 07:24:17 +01:00
Torkel Ödegaard
b25214bfe1
Merge pull request #14786 from grafana/14729-move-testrulebutton-to-toolbar
14729 move testrulebutton to toolbar
2019-01-10 07:11:45 +01:00
SamuelToh
9e3ab71e40 11503: escape measurement filter regex value 2019-01-10 10:47:22 +10:00