IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
23,401 Commits 5,454 Branches 554 Tags 1.9 GiB
8fd1931e1c
Commit Graph

1271 Commits

Author SHA1 Message Date
Torkel Ödegaard
124b3486eb Merge branch 'master' into 15330-vizpicker-red-when-0-hits 2019-02-13 14:49:11 +01:00
Torkel Ödegaard
cfea8bdcae Prettier had not been running as a precommit hook for some time so had to run in on all files again 2019-02-13 11:14:53 +01:00
ijin08
09dbd6b1a6 removed _plugins.scss and _settings_permissions.scc, removed unused classes in _login.scss, reduced dark variabels in light theme and alignied light theme a bit with dark theme, turned blue-gray, dark-3 and panel-bg variables into one variable and removed gray-7 in dark theme 2019-02-13 11:04:22 +01:00
Johannes Schill
b6305c2d80 Revert "feat: Add css-support for invalid form input elements" 
This reverts commit b1aa84804b.
 2019-02-13 07:46:21 +01:00
Johannes Schill
b1aa84804b feat: Add css-support for invalid form input elements 2019-02-12 16:14:48 +01:00
Torkel Ödegaard
5195954681 style tweak to alert 2019-02-11 16:50:12 +01:00
Torkel Ödegaard
931bece16e Merge branch 'master' into ui-new-red-green-blue 2019-02-11 15:00:00 +01:00
Torkel Ödegaard
962815169e Color tweaks 2019-02-11 14:58:11 +01:00
Torkel Ödegaard
77ba734491 Fixed issue with light theme introduced by #15333 2019-02-11 13:54:50 +01:00
Torkel Ödegaard
9570394c49 minor style update 2019-02-11 13:42:37 +01:00
Torkel Ödegaard
b14958edef Minor style fixes 2019-02-11 13:24:02 +01:00
Torkel Ödegaard
a4dd63e224 Merge branch 'master' into ui-new-red-green-blue 2019-02-11 13:04:25 +01:00
Torkel Ödegaard
a402a3713f
Merge pull request #15339 from grafana/navbar-back-btn 
Navbar back btn
 2019-02-11 10:28:47 +01:00
Torkel Ödegaard
9565e48f03 Fixed issue where double clicking on back button closes sidemenu 2019-02-11 09:37:13 +01:00
Patrick O'Carroll
c34021344a
Merge branch 'master' into ui-new-red-green-blue 2019-02-11 09:17:19 +01:00
Torkel Ödegaard
f38e64cc5d Navbar back button, no title edit this time 2019-02-10 20:01:22 +01:00
Torkel Ödegaard
748cb44911 Fixed issues with plus button in threshold and panel option header, and current state in viz picker, fixes #15329 2019-02-08 21:53:51 +01:00
Torkel Ödegaard
0f96cf8662 slight tweaks 2019-02-07 19:06:51 +01:00
Torkel Ödegaard
e080983147 Panel edit navbar poc 2019-02-07 16:14:11 +01:00
ijin08
0642c52693 created new color variables, changed primary to blue, changed success-btns to primary-btns. 2019-02-05 12:05:02 +01:00
Torkel Ödegaard
28fc27c4ae Merge branch 'master' of github.com:grafana/grafana into dashboard-react-page 2019-02-05 09:23:58 +01:00
Johannes Schill
9ab5eeb7f3 fix: Explore: Query wrapping on long queries #15222 2019-02-04 17:26:20 +01:00
Johannes Schill
648bec1807 fix: Set ace editor min height to avoid problem with scrollbar overlapping ace content #15122 2019-02-04 15:19:23 +01:00
Johannes Schill
bc21c9520f fix: Data source picker in panel queries options should overlap content below, including ace scrollbar #15122 2019-02-04 15:07:11 +01:00
Torkel Ödegaard
217468074f added submenu, made sure submenu visibility is always up to date 2019-02-04 11:19:45 +01:00
Torkel Ödegaard
883f7a164b added time picker 2019-02-03 21:06:07 +01:00
Torkel Ödegaard
8dec74689d Dashboard settings starting to work 2019-02-03 10:55:58 +01:00
Torkel Ödegaard
35693d3b23
Merge pull request #15199 from grafana/fix/label-margin-datasource-list 
setting margin on label in datasourcelist
 2019-02-01 15:43:28 +01:00
Peter Holmberg
4b03e7c31f setting margin on label 2019-02-01 15:03:19 +01:00
Torkel Ödegaard
2a4b10a5c8 minor fix 2019-02-01 13:40:46 +01:00
Torkel Ödegaard
ac0140d596 Fixed dashboard row title not updating when variable changed, fixes #15133 2019-02-01 06:38:59 +01:00
Torkel Ödegaard
474185c977 Moved a few things around 2019-01-31 08:37:15 +01:00
Torkel Ödegaard
0c4f59a7f1 Minor style fix to button group 2019-01-29 21:30:31 +01:00
Torkel Ödegaard
0ac0588583
Merge pull request #15107 from grafana/explore-query-styles 
Updated Explore query styles to align them to other query editors
 2019-01-29 15:38:06 +01:00
Torkel Ödegaard
8b70a8dd50 Fixed explore query editor styling issues 2019-01-29 14:36:09 +01:00
Torkel Ödegaard
71d0fae3a9 Progress on tooltip style update 2019-01-29 13:42:29 +01:00
Torkel Ödegaard
0e2310de8e Merge branch 'master' into tooltip-restyling 2019-01-29 11:02:40 +01:00
Torkel Ödegaard
6dad4cce07 Updated Explore query styles to align them to other query editor to make them fit in better 2019-01-29 08:14:07 +01:00
Torkel Ödegaard
a7b486d998
Merge pull request #15040 from grafana/14807-enable-webit-scrollbar-styles 
Re-enable webit-prefixed scrollbar styles
 2019-01-28 17:51:39 +01:00
Torkel Ödegaard
5e1a3c9ee2
Merge pull request #15023 from grafana/improve-organization 
More file re-organization & clean-up
 2019-01-26 10:53:09 +01:00
Hugo Häggmark
72a0ba29f5 Makes the clickable side menu header look great in light theme again 2019-01-25 06:44:32 +01:00
Johannes Schill
45fc9c1860 fix: Enable -webkit-scrollbar related css when there's no overlay scrollbar #14807 2019-01-24 12:43:25 +01:00
Torkel Ödegaard
e713b0f029 Moved add panel panel and renamed it to add panel widget 2019-01-24 09:23:48 +01:00
ijin08
30f27a966b changed light-theme tool-tip to be a bit lighter, trying different paddings 2019-01-23 15:39:13 +01:00
Torkel Ödegaard
8a9582dad5 minor updates 2019-01-23 13:54:34 +01:00
Hugo Häggmark
a6428fef0c Added link to side menu header and fixed styling 2019-01-22 08:12:48 +01:00
Torkel Ödegaard
16d476d228 Query editor row style update & sass cleanup 2019-01-18 19:22:40 +01:00
Torkel Ödegaard
521c8f34f7 Moved add query button to the right 2019-01-18 15:29:58 +01:00
Torkel Ödegaard
a6683dd90e Merge branch 'master' into react-query-editor 2019-01-17 14:57:49 +01:00
Torkel Ödegaard
cc4564cf8b Query editor row in react is working 2019-01-17 13:08:20 +01:00
Torkel Ödegaard
bc956057c3 Query editor row react progress, buttons working 2019-01-17 10:26:08 +01:00
Torkel Ödegaard
6a66d462aa Toggle edit mode works 2019-01-16 17:53:40 +01:00
Johannes Schill
8237c22e24 fix: Add CustomScroller on DataSources page 2019-01-16 16:03:15 +01:00
Torkel Ödegaard
166e5edebd wip: testing new query editor row design 2019-01-16 14:00:29 +01:00
Hugo Häggmark
c90979a8f0 Moved ValueMappings to grafana/ui/component and renamed it ValueMappingsEditor 2019-01-16 12:29:04 +01:00
Dominik Prokop
89a0d1090d Move ColorPicker leftovers to @grafana/ui 2019-01-15 15:43:17 +01:00
Torkel Ödegaard
5b59d59afa panel option section moved to grafana-ui and new panel option grid component 2019-01-12 21:43:41 +01:00
Hugo Häggmark
d97cd450c9 Merge 2019-01-11 11:41:08 +01:00
Dominik Prokop
537e2534a6 Move Select styles to grafana/ui 2019-01-11 09:50:05 +01:00
Hugo Häggmark
1581662a6c Moved Thresholds and styles to grafana/ui/components 2019-01-11 07:11:40 +01:00
Dominik Prokop
525367c591 Merge branch 'master' into fix-toggle-button-group-corners 2019-01-09 13:15:34 +01:00
Johannes Schill
702e1b01bb chore: Move sass code related to custom scrollbar into @grafana/ui #14759 2019-01-09 10:35:03 +01:00
Dominik Prokop
79c6fdc0e8 wip 2019-01-08 20:51:00 +01:00
Johannes Schill
79fd8a7eda feat: Add "theme" to Tooltip 2019-01-07 13:31:50 +01:00
Simon Podlipsky
35f6f50f40 Fixed timepicker css issue introduced by PR #14700 and remove hotfix from 297241c 2019-01-04 12:24:22 +01:00
Torkel Ödegaard
297241c4ab Fixed timepicker css issue introduced by PR #14700 2019-01-04 09:35:16 +01:00
Torkel Ödegaard
24ee10ca01
Merge pull request #14705 from grafana/panel-size-fixes 
Fixed issues with panel size in edit mode, fixes #14703
 2019-01-02 11:48:02 +01:00
Torkel Ödegaard
9aef3f4fb1 Fixed issues with panel size in edit mode, fixes #14703 2019-01-02 10:54:57 +01:00
Torkel Ödegaard
940692189b
Merge pull request #14700 from simPod/timepicker 
Tweak datetime picker layout for mobile
 2019-01-01 15:33:28 +01:00
Simon Podlipsky
a5c05d273f Tweak datetime picker layout for mobile 2018-12-31 19:47:42 +01:00
David Kaltschmidt
39833b0df7 Explore: logging UI style fixes 
- baseline aligment for meta field labels
- use variables for font sizes and margins
 2018-12-31 12:05:07 +00:00
Torkel Ödegaard
ce0dcd5cab Husky and sasslint fixes, fixes #14638 2018-12-25 20:20:59 +01:00
Torkel Ödegaard
66a13b281c Merge branch 'grafana-lib' 2018-12-25 19:26:46 +01:00
Torkel Ödegaard
4b323d9879 Moved sass for component to @grafana/ui lib 2018-12-24 07:05:18 +01:00
Torkel Ödegaard
0fd403a783
Merge pull request #14647 from grafana/explore-options-margin-increase 
Increased margin between controls in logs panel
 2018-12-23 17:45:49 +01:00
Torkel Ödegaard
270d52495d Increased margin between controls in logs panel, fixes #14637 2018-12-23 07:18:11 +01:00
David
b2401e37fa
Merge pull request #14414 from grafana/davkal/explore-logging-search 
Explore: Split logging query into selector and search
 2018-12-22 17:00:57 +01:00
Torkel Ödegaard
9aa2764753 Fixed panel height & scroll issue with flexbox in firefox, fixes #14620 2018-12-22 08:58:08 +01:00
Torkel Ödegaard
d0f8d034df Quick refactoring of time picker styles, needs a much bigger redesign 2018-12-19 13:13:46 +01:00
Torkel Ödegaard
6542bfb83e Merge branch 'fix-misspell-issues' of https://github.com/mjtrangoni/grafana into mjtrangoni-fix-misspell-issues 2018-12-19 11:21:34 +01:00
Johannes Schill
a007730f5d Another take on resizing the panel, now using react-draggable 2018-12-18 17:22:30 +01:00
Torkel Ödegaard
e8f9174d08 Minor update 2018-12-18 09:58:27 +01:00
Torkel Ödegaard
1ee1247912 Gauge option form markup fixes 2018-12-17 17:54:40 +01:00
Torkel Ödegaard
c20e10a584 Merge branch 'master' into 14409/threshold-ux-changes 2018-12-17 16:25:33 +01:00
Peter Holmberg
ade2f297a7 adding threshold 2018-12-17 14:15:04 +01:00
Torkel Ödegaard
7455dfcc84 minor style tweak 2018-12-17 12:57:40 +01:00
Torkel Ödegaard
d7e5582c76 minor style fixes 2018-12-16 10:31:37 -08:00
Torkel Ödegaard
e99dbefb98 minor style fix 2018-12-15 11:29:50 -08:00
Torkel Ödegaard
f67e0827b2 Fixes and cleanup 2018-12-15 10:04:25 +01:00
Simon Podlipsky
2d296715ec Show predefined time ranges as first in timepicker on small screens 2018-12-15 00:55:24 +01:00
Torkel Ödegaard
248015c937 code cleanup in add panel, and switched off grid css transforms to fix z-index issuse 2018-12-14 20:53:42 +01:00
Torkel Ödegaard
9ac11f1d9d updated add panel a bit 2018-12-14 17:39:33 +01:00
Torkel Ödegaard
9d8d5b18ef Merge remote-tracking branch 'origin/develop-addpanelpanel' into add-panel-rewrite 2018-12-14 17:04:33 +01:00
Torkel Ödegaard
6e2f6701ac minor style fix 2018-12-14 16:48:13 +01:00
Torkel Ödegaard
beff16bc8d updated snapshot 2018-12-14 16:38:52 +01:00
Torkel Ödegaard
677eb6d179 fixes to unit picker 2018-12-14 16:27:48 +01:00
Peter Holmberg
7c83d7ba82 updates on thresholds component 2018-12-14 16:27:42 +01:00
Torkel Ödegaard
84df0e2dde Added custom scrollbar to select component 2018-12-14 15:25:49 +01:00
ijin08
3215f8abfe replaced content in addpanelpanel with three buttons that can create new panel, paste copied panel, and add a new row, to paste panel one must copy one first, code is still quite rough 2018-12-14 14:33:49 +01:00
Peter Holmberg
a7548cd294 Merge remote-tracking branch 'origin/develop' into 14409/threshold-ux-changes 2018-12-14 14:08:53 +01:00
Torkel Ödegaard
ae76ddcc3b explore using data source picker 2018-12-14 14:05:47 +01:00
Torkel Ödegaard
9c13520e97 updated styles 2018-12-13 21:24:41 +01:00
Peter Holmberg
234095e6df starting with threshold refactor 2018-12-13 16:46:10 +01:00
Torkel Ödegaard
dc22beadca wip: style change progress 2018-12-13 16:02:14 +01:00
Torkel Ödegaard
3f1adf1390 wip: styles are starting to come together 2018-12-13 14:28:44 +01:00
Torkel Ödegaard
889518e8e1 wip: styles 2018-12-13 13:27:33 +01:00
Torkel Ödegaard
fe0f66b3f2 wip: testing new styles 2018-12-13 13:14:39 +01:00
Torkel Ödegaard
5fde977185 wip: style changes 2018-12-13 13:05:43 +01:00
Torkel Ödegaard
226e55b188 fixed ordering changing panel types, fixes issues with loading panel options 2018-12-13 11:35:07 +01:00
Torkel Ödegaard
1d325cf66f
Merge pull request #14423 from grafana/14378-develop-table-options-ux 
Removed side menu for column styles
 2018-12-13 09:12:05 +01:00
Torkel Ödegaard
a9e98feea0
Merge pull request #14476 from grafana/metrics-tab-changes-2 
Metrics tab changes 2
 2018-12-13 09:11:14 +01:00
Torkel Ödegaard
f39fd7655e wip: minor style changes 2018-12-13 08:56:20 +01:00
Torkel Ödegaard
666e8e8330 wip: changes 2018-12-13 07:44:58 +01:00
Torkel Ödegaard
1751a51088 wip 2018-12-12 14:44:40 +01:00
Torkel Ödegaard
be7e7fcb40 things are working 2018-12-12 13:59:19 +01:00
Torkel Ödegaard
b6a5375af1 wip 2018-12-12 12:51:39 +01:00
Torkel Ödegaard
21e1d7b05b wip 2018-12-12 11:24:18 +01:00
Torkel Ödegaard
7161b2dc9b wip 2018-12-12 09:51:17 +01:00
Torkel Ödegaard
87e6f86f87 wip metrics tab changes 2018-12-12 08:33:49 +01:00
Torkel Ödegaard
fa4fddf7b5 React-select refactorings 2018-12-11 22:17:32 +01:00
Torkel Ödegaard
1d7d72b49d wip: react select css refactoring 2018-12-11 18:49:48 +01:00
Torkel Ödegaard
d998527128 wip 2018-12-11 17:03:38 +01:00
Peter Holmberg
5f7bc13678 Adding label 2018-12-11 15:58:48 +01:00
Peter Holmberg
6ab93982ae styling on dropdowns 2018-12-11 15:47:30 +01:00
Peter Holmberg
c2b1f504a0 Merge remote-tracking branch 'origin/develop' into gauge-value-mappings 2018-12-11 15:19:28 +01:00
Peter Holmberg
346f5f2595 Using drop down instead 2018-12-11 15:14:53 +01:00
Peter Holmberg
ddf080dab6 Using an id to identify mappings 2018-12-11 14:17:58 +01:00
Torkel Ödegaard
4591c3555c Moved more metrics tab to react 2018-12-11 13:36:44 +01:00
Torkel Ödegaard
5d4034be5a Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-11 10:13:57 +01:00
Torkel Ödegaard
f9110f7902 Merge branch 'master' into develop 2018-12-11 10:00:29 +01:00
Johannes Schill
20134c902b Add keyboard navigation to datasource picker via a hoc. 2018-12-10 21:42:53 +01:00
Johannes Schill
856c0ee052 Fix styling for vizPicker keyboard nav and change so only arrow up/down is OK to use 2018-12-10 15:20:32 +01:00
Peter Holmberg
4a57d594e5 fixed styling 2018-12-10 14:50:32 +01:00
Johannes Schill
ae5bc366c2 Start adding keyboard navigation to VizPicker 2018-12-10 14:45:49 +01:00
Torkel Ödegaard
74b3a509f7 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-10 12:32:37 +01:00
Torkel Ödegaard
514c8a0210 fixed issue with grid responsive mode 2018-12-10 12:20:14 +01:00
Torkel Ödegaard
7e0bc8f30d fixed max height issue not being respected by react select dropdown 2018-12-10 12:02:27 +01:00
ijin08
ee55a9c18b removed side menu for column styles, added small header to column styles with a border 2018-12-10 11:59:02 +01:00
David Kaltschmidt
6b9200a606 Explore: Split logging query into selector and search 
- add second query field to logging datasource query component
- second field manages search term, first field manages stream selectors
- improved logging cheat sheet to get started
 2018-12-09 18:44:59 +01:00
David Kaltschmidt
b0c431ae67 Fix logs panel meta wrap 2018-12-09 17:22:35 +01:00
Torkel Ödegaard
683b718e2b align yellow collor with graph in logs table 2018-12-08 09:45:02 -08:00
Torkel Ödegaard
3d0c54a946 logs style polish 2018-12-07 12:13:23 -08:00
Torkel Ödegaard
cb59f388ca explore logs options styling 2018-12-07 17:23:35 +01:00
Torkel Ödegaard
bfbb44af03 transparent toggle style and new button group style 2018-12-07 17:15:46 +01:00
Torkel Ödegaard
eb6d0e9f51 Merge branch 'master' into develop 2018-12-07 14:59:38 +01:00
Torkel Ödegaard
7cb456ea23 Aligned styling of stats popover/box with rest of grafana & minor css refactoring 2018-12-07 11:28:22 +01:00
David Kaltschmidt
fb4925a8c2 Rebase fixes 2018-12-07 10:22:52 +01:00
David Kaltschmidt
acd52e6a93 Explore: Logging line parsing and field stats 
Lazily parse lines and display stats for field when clicked on.

- log line parsers for JSON (basic), and logfmt
- delayed parsing in case user moves to other line
- reuse label stats for field stats
 2018-12-07 09:59:55 +01:00
Torkel Ödegaard
ef77748a1b
Merge pull request #14368 from grafana/explore-logs-styling-alt2 
Explore logs styling
 2018-12-06 22:30:06 +01:00
Torkel Ödegaard
e7fe0bd668 fixed unit tests 2018-12-06 12:29:55 -08:00