Commit Graph

17880 Commits

Author SHA1 Message Date
Torkel Ödegaard
7f46b75330 Merge branch 'develop' into panel-edit-in-react 2018-11-20 09:51:06 +01:00
Torkel Ödegaard
649d727805 Merge branch 'master' into develop 2018-11-20 09:47:23 +01:00
Marcus Efraimsson
cab2c5189a
Merge pull request #14129 from daktari/master
Add Cloudwatch/CloudHSM Metrics and dimensionMaps
2018-11-20 00:42:22 -08:00
Torkel Ödegaard
f44e634da4 switch slider changes 2018-11-20 09:39:56 +01:00
Leonard Gram
1a554e2421 linters. 2018-11-20 09:01:52 +01:00
Leonard Gram
7e2298ce31 build: correct filters for ge build artifacts. 2018-11-20 09:01:52 +01:00
Leonard Gram
84832cb6cb build: releaser supports releasing only some artifacts. 2018-11-20 09:01:52 +01:00
Leonard Gram
87707c964c Revert "docs: building Grafana on arm."
Further work-arounds are needed to make this work.
This reverts commit 8a2de58728.
2018-11-20 08:46:09 +01:00
Javier
0900470dda Add Cloudwatch/CloudHSM Metrics and dimensionMaps 2018-11-19 18:10:34 +01:00
Marcus Efraimsson
9af5e9a448
Merge pull request #14127 from grafana/team_members_fix
Remove react warning in team members page
2018-11-19 09:03:41 -08:00
Marcus Efraimsson
0aca6f587b
remove react warning 2018-11-19 17:54:17 +01:00
Torkel Ödegaard
571cfab923 added chekbox and other tweaks 2018-11-19 17:41:48 +01:00
Leonard Gram
8a2de58728 docs: building Grafana on arm. 2018-11-19 16:50:19 +01:00
Torkel Ödegaard
808a0aa6f0 Merge branch 'develop' into switch-slider-test 2018-11-19 16:48:16 +01:00
Torkel Ödegaard
1e7a23b0f1 Merge remote-tracking branch 'origin/12759-description-n-links' into develop 2018-11-19 16:47:29 +01:00
David
5a759a8317
Merge pull request #14118 from grafana/davkal/explore-logs-dedup
Explore: POC dedup logging rows
2018-11-19 15:36:26 +00:00
David Kaltschmidt
4771eaba5b Explore: POC dedup logging rows
- added dedup switches to logs view
- strategy 'exact' matches rows that are exact (except for dates)
- strategy 'numbers' strips all numbers
- strategy 'signature' strips all letters and numbers to that only whitespace and punctuation remains
- added duplication indicator next to log level
2018-11-19 16:26:47 +01:00
David
d4e792dccd
Merge pull request #14107 from grafana/davkal/explore-panel
Explore: collapsible result panels
2018-11-19 15:17:05 +00:00
David
c20c787b62
Merge pull request #14104 from grafana/davkal/prometheus-rule-expansion
Prometheus: fix rules expansion
2018-11-19 15:11:09 +00:00
Marcus Efraimsson
0d30f3ba52
update snapshot 2018-11-19 14:57:34 +01:00
Marcus Efraimsson
ebadcdb535
changelog: add notes about closing #13352
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
f5dfaacee3
changelog: add notes about closing #13810
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
34746e42ef
changelog: add notes about closing #13605
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
dbb7396c77
changelog: add notes about closing #13876
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
8246ee343c
changelog: add notes about closing #13946
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
a77c86169e
changelog: add notes about closing #13555
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
1a64b44c91
changelog: add notes about closing #13425
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
3c91e4de56
changelog: add notes about closing #13655
[skip ci]
2018-11-19 14:50:39 +01:00
Leonard Gram
abd796c65f
Merge pull request #14122 from xlson/publisher-rhel-final-aware
Corrects an issue where nightly rpms would be misstagged.
2018-11-19 14:43:02 +01:00
Torkel Ödegaard
c67b55776c
Merge pull request #14123 from grafana/switch-back-from-mixed
fixed issue switching back from mixed data source
2018-11-19 14:40:37 +01:00
Johannes Schill
00596f0afc react-panel: Finish the data source search on query tab and start moving switch-data-source-logic from angular 2018-11-19 14:35:16 +01:00
Leonard Gram
b041ad4134 linter. 2018-11-19 14:32:39 +01:00
Torkel Ödegaard
0053bee886
Merge pull request #14121 from grafana/panel-size-in-edit-mode-fix
fixed issue with panel size when going into edit mode
2018-11-19 14:21:37 +01:00
Torkel Ödegaard
1157a62375 fixed issue switching back from mixed data source, introduced by react panels changes 2018-11-19 14:20:19 +01:00
Leonard Gram
ac55aeff95 build: minor refactor. 2018-11-19 14:12:04 +01:00
Leonard Gram
8f0d3ff7ea build: fixes a bug where nightly rpm builds would be handled as stable. 2018-11-19 14:06:18 +01:00
bergquist
862815d18d go meta lint errors 2018-11-19 14:00:20 +01:00
Marcus Efraimsson
638eca3cdb
update changelog
[skip ci]
2018-11-19 13:59:20 +01:00
Leonard Gram
2d361eeabf builds: introduces enum for relase type. 2018-11-19 13:26:35 +01:00
Marcus Efraimsson
c22e7f4263
fix group sync cta link 2018-11-19 13:23:17 +01:00
Torkel Ödegaard
d81d2f00f6 fixed issue with panel size when going into edit mode 2018-11-19 12:26:15 +01:00
Marcus Efraimsson
6c68976cab
changelog: add notes about closing #13924
[skip ci]
2018-11-19 11:29:03 +01:00
Marcus Efraimsson
05a32d19be
Merge pull request #14110 from vinicyusmacedo/master
Added google oauth account id
2018-11-19 02:21:11 -08:00
Leonard Gram
e2007733f4 build: table-driven tests for publisher. 2018-11-19 11:20:44 +01:00
Marcus Efraimsson
60fd8ee9d4
fix id returned from google is a string 2018-11-19 11:11:13 +01:00
bergquist
8130067fd1 changelog: adds note about closing #7886 & #6202 2018-11-19 10:47:37 +01:00
Carl Bergquist
6049855dc7
Merge pull request #13947 from bergquist/alerting_for
Introduce alert debouncing
2018-11-19 10:38:02 +01:00
Torkel Ödegaard
c856c21b77
Merge pull request #14116 from cinaglia/fix-singlestat-xss
Mitigate XSS vulnerabilities in Singlestat panel
2018-11-19 10:36:44 +01:00
Marcus Efraimsson
959d7036a7
Merge pull request #14084 from xlson/internal-metrics-packaging
build: internal metrics for packaging.
2018-11-19 01:25:33 -08:00
bergquist
23b1fbcf48 changelog: adds note about closing #11893 2018-11-19 10:22:26 +01:00