Torkel Ödegaard
647cb6ddae
Merge branch 'master' of https://github.com/joshuawoodward/grafana into joshuawoodward-master
2019-03-11 13:10:45 +01:00
Torkel Ödegaard
4a70d4ef61
Merge pull request #15859 from grafana/font-use-rem-and-variables
...
Styling update to fonts
2019-03-11 13:09:49 +01:00
Dominik Prokop
a853e2c36e
Fix deduplication results displaying wrong data ( #15755 )
...
The log rows were mutated in the store, what resulted in wrong deduplication results as well as made the selector memoization quirky - for "the same results" the selector was running twice.
2019-03-11 11:48:14 +01:00
ijin08
d55f189749
added new space variables to margins in AddPanelWidget, add_data_source, dashboard_settings and sidemenu
2019-03-11 11:33:15 +01:00
Torkel Ödegaard
90a3bc2203
Merge pull request #15892 from sandlis/14706-es-weekly-pattern-fix
...
Fix : #14706 Incorrect index pattern padding in alerting queries
2019-03-11 11:01:22 +01:00
Torkel Ödegaard
5fab1e89d3
Merge pull request #15897 from grafana/revert-15608-fix-datasource-update
...
Revert "Fix Datasource Update to no User/Password"
2019-03-11 10:58:28 +01:00
Torkel Ödegaard
3f574d3e57
Merge pull request #15685 from utkarshcmu/fix-#15562
...
Fixed alias in Cloudwatch Expressions
2019-03-11 10:49:30 +01:00
Alexander Zobnin
57f48f17a0
heatmap: don't display cut cards
2019-03-11 12:42:16 +03:00
Alexander Zobnin
bef024e4eb
heatmap: fix error when series empty
2019-03-11 11:58:52 +03:00
Alexander Zobnin
9dbcc0fb6e
heatmap: middle bucket bound option, #15683
2019-03-11 11:46:30 +03:00
ryan
7054cf8bb5
rotate!
2019-03-11 01:08:00 -07:00
ijin08
7dc4853e91
added new variables for spacing, set margins in _cards with new variables
2019-03-11 08:51:32 +01:00
ryan
61053ec099
better css
2019-03-11 00:45:15 -07:00
Carl Bergquist
a6e5e777be
Merge pull request #15896 from genofire/patch-1
...
fix imageurl in notification test
2019-03-11 07:32:14 +01:00
Carl Bergquist
f3753712e0
Revert "Fix Datasource Update to no User/Password"
2019-03-11 07:22:54 +01:00
ryan
91a2307b98
rotate!
2019-03-10 23:11:57 -07:00
genofire
6d578dd372
fix imageurl in notification test
...
skip unnecessary http -> https redirect, which could make problems on some notifiers
2019-03-11 00:23:07 +01:00
ryan
b80c773ebe
attach themes to table story
2019-03-10 15:34:02 -07:00
ryan
0a094c1226
merge master
2019-03-10 13:45:18 -07:00
Torkel Ödegaard
fc41d10b9e
Merge pull request #15891 from ryantxu/string-utils
...
move stringToJsRegex to grafana/ui
2019-03-10 19:56:36 +01:00
Dominik Prokop
eefba7373d
Merge pull request #15890 from ryantxu/storybook-cleanup
...
Minor storybook cleanup
- DeleteButton should use withCenteredStory like everythign else
- Clicking the 'Red' button should not pick blue :)
2019-03-10 19:42:20 +01:00
Carl Bergquist
e46e71bbf3
Merge pull request #15878 from zhulongcheng/docs-add-slack-url
...
docs: update slack alert notification settings
2019-03-10 19:40:01 +01:00
ryan
f7f124c56b
reuse deprecationWarning
2019-03-10 10:37:44 -07:00
ryan
d13eebfe52
move to string.ts
2019-03-10 10:19:02 -07:00
ryan
b2a7891b08
move stringToJsRegex
2019-03-09 23:50:46 -08:00
ryan
494acddb2f
get field mapping to actually work
2019-03-09 23:39:11 -08:00
ryan
1cb03670c4
add variable size storybook
2019-03-09 23:07:42 -08:00
ryan
fe22d14e93
cell builder cleanup
2019-03-09 20:47:02 -08:00
ryan
11188b53af
minor storybook cleanup
2019-03-09 15:43:49 -08:00
ryan
6494c17cfa
fix typos
2019-03-09 15:27:14 -08:00
ryan
e2be194b46
autofill space rather than force with/height values
2019-03-09 15:10:06 -08:00
ryan
9134620c1a
return table directly, not the debug info
2019-03-09 14:15:41 -08:00
Sofia Papagiannaki
4cf698af10
Minor fix in values to histogram conversion
...
Filter out values outside the min and max boundaries
because they are assigned to uninitialized buckets
(outside min and max bounds).
2019-03-09 20:36:31 +02:00
Sofia Papagiannaki
5ed3139d5a
Fix histogram x-axis min/max
...
This commit:
*fixes histogram computation when zero x-axis min/max are set
(they used to be ignored).
*validates the user defined x-axis min/max values
and ignores them if they result in invalid bucket sizes.
2019-03-09 20:36:30 +02:00
ryan
c7f35f2dcf
moved utillities to util
2019-03-09 10:16:43 -08:00
Sofia Papagiannaki
96e1804d55
Change xaxis min and max form input types to number
2019-03-09 17:20:14 +02:00
Sofia Papagiannaki
f0d1a9157f
Fix histogram xaxis min/max tests
2019-03-09 17:20:14 +02:00
Sofia Papagiannaki
332ecd483f
Optionally set histogram x-axis min/max
2019-03-09 17:20:14 +02:00
ryan
078d8f1210
table using MultiGrid
2019-03-09 00:27:33 -08:00
ryan
343e49decb
Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table
...
* grafana/master: (24 commits)
docs: Fix indentation level for OAuth2 config
docs: update CONTRIBUTING.md
@grafana/ui - release docs v1 (#15835 )
Minor refactoring of copy tags when saving feature, #15446
Simple implementation for preserve tags, closes #11627
Updated prettierignore
Refactoring of PR #14772
fix typo in pr template
add nil/length check when delete old login attempts
Minor refactoring of new react text panel
fix allow anonymous server bind for ldap search
use pure component
use replaceVariables
Catch bad regex exception at controller level
11780: invalid reg value can cause unexpected behaviour
update
Add string quote func
Remove option used to control within browser
Add pic into actionCard message
Add new option to set where to open the message url
...
2019-03-08 20:52:30 -08:00
ryan
3bd26df7de
cleanup
2019-03-08 20:49:45 -08:00
ryan
eca3824e2d
cleanup
2019-03-08 20:36:52 -08:00
ryan
40d7ba1e6a
adding toolbar
2019-03-08 18:02:52 -08:00
ryan
9df47391ea
adding stub table input CSV
2019-03-08 16:49:45 -08:00
Daniel Lee
0ae9c1c5cc
Merge pull request #15882 from nowke/patch-1
...
docs: Fix indentation level for OAuth2 config
2019-03-09 00:35:46 +01:00
Torkel Ödegaard
6d6c7698e4
Merge pull request #15881 from zhulongcheng/docs-Contributing
...
docs: update CONTRIBUTING.md
2019-03-08 18:55:48 +01:00
Navaneesh Kumar
ccdc82b921
docs: Fix indentation level for OAuth2 config
2019-03-08 22:38:50 +05:30
zhulongcheng
e08d8eb55d
docs: update CONTRIBUTING.md
2019-03-09 00:30:20 +08:00
zhulongcheng
7743f77e45
docs: update slack alert notification settings
...
closes #15878
2019-03-09 00:19:21 +08:00
Torkel Ödegaard
570187384b
Merge pull request #13825 from athurg/optimize_dingding_alert_message
...
Optimize dingding alert message
2019-03-08 15:33:24 +01:00
