IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 08:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
18,799 Commits 1,121 Branches 715 Tags
3f05364eb9cfb30fae8f81e388de129b7fd335c0
Commit Graph
18799 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Sundell 3f05364eb9 remove extra arrow div 2019-01-02 13:03:19 +01:00
Erik Sundell e7670cacf4 fix condition that expands group if it has a selected child. also make it possible to pass expanded as a prop 2019-01-02 13:03:19 +01:00
Erik Sundell 9715260151 align input widths 2019-01-02 13:03:19 +01:00
Erik Sundell 3afe8a0763 remove console log 2019-01-02 13:03:18 +01:00
Erik Sundell 55f558cb7c rename directive 2019-01-02 13:03:18 +01:00
Erik Sundell 843e9fb4dc remove linebreak 2019-01-02 13:03:18 +01:00
Erik Sundell 566001aaf2 remove old group heading 2019-01-02 13:03:18 +01:00
Erik Sundell 4734788db4 use new generic picker 2019-01-02 13:03:17 +01:00
Erik Sundell 478cfc195a remove on metric type change 2019-01-02 13:03:17 +01:00
Erik Sundell 014457c486 fix remove filter bug 2019-01-02 13:03:17 +01:00
Erik Sundell 85a434568f use same color for label as in explore dropdown 2019-01-02 13:03:17 +01:00
Erik Sundell f68db4eded cleanup query filter 2019-01-02 13:03:17 +01:00
Erik Sundell b6c6cc1ff6 update failing tests 2019-01-02 13:03:17 +01:00
Erik Sundell 615fa6fc7d remove redundant default value 2019-01-02 13:03:16 +01:00
Erik Sundell 4d19ac5c02 use new option group in aggregation directive 2019-01-02 13:03:16 +01:00
Erik Sundell 406c0d15a5 remove redundant default value 2019-01-02 13:03:16 +01:00
Erik Sundell b5d6cd1cc8 wip: add option group component 2019-01-02 13:03:16 +01:00
Erik Sundell 488e92e7f5 wip: add basic option header 2019-01-02 13:03:16 +01:00
Erik Sundell 70c2efd711 Wrap react select component in angular directive 2019-01-02 13:03:15 +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 f59541b490 Merge pull request #14698 from simPod/update-lock 
Update yarn.lock
 2019-01-01 15:39:17 +01:00
Torkel Ödegaard 9e91d91788 Merge pull request #14689 from grafana/davkal/loki-limit 
Loki: query limit configurable in datasource
 2019-01-01 15:38:59 +01:00
Torkel Ödegaard 46f9418605 Merge pull request #14696 from grafana/davkal/fix-14686 
Logs data model: add more log levels
 2019-01-01 15:37:37 +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
Simon Podlipsky 5f4eeea481 Update yarn.lock 2018-12-31 19:17:07 +01:00
Dan Cech efa738ddf6 Merge pull request #14540 from grafana/session-skip-update 
only update session in mysql database when required
 2018-12-31 11:54:04 -05:00
Torkel Ödegaard 22399b336f Merge pull request #14577 from marefr/14351_db_migration 
fix only create/drop database indices if not exists/exists
 2018-12-31 16:20:07 +01:00
David Kaltschmidt a364487b3a Logs data model: add more log levels 
- add `eror` used in github.com/inconshreveable/log15 (used by Grafana as well)
- add levels from SYSLOG
 2018-12-31 14:44:13 +00:00
David Kaltschmidt f4b4ee3ff8 Review feedback 2018-12-31 14:10:45 +00:00
David b712337a3b Merge pull request #14693 from grafana/davkal/loki-single-query 
Loki: change query row to be single field again
 2018-12-31 14:55:44 +01:00
Torkel Ödegaard 75f9d173ff Merge pull request #14691 from grafana/davkal/fix-14690 
Explore: logging UI style fixes
 2018-12-31 14:34:18 +01:00
Torkel Ödegaard 68897c18b2 Merge pull request #14694 from grafana/davkal/fix-14668 
Explore: fix loading indicator z-index on panel container
 2018-12-31 14:33:52 +01:00
David Kaltschmidt 652c149ca2 Explore: fix loading indicator z-index on panel container 
- existing z-index placed the loading indicator above dropdowns of the panel children
- removed z-index for natural ordering
 2018-12-31 12:55:03 +00:00
David Kaltschmidt 32438c4716 Loki: change query row to be single field again 
- tried split selector and search for a week, and it did not feel natural
- keeping some of the original modifications in QueryField from splitting PR
- adapted CheatSheet and placeholder text
- added new label selector state: No labels found
 2018-12-31 12:38:13 +00: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
David Kaltschmidt 26a5e07737 Loki: query limit configurable in datasource 
- Loki queries must contain a limit
- this change makes this limit configurable in the datasource
- keep default at 1000, add tooltip on why inc/dec makes sense
- added tests
 2018-12-31 11:25:28 +00:00
Torkel Ödegaard 6f998541c8 Merge branch 'master' of github.com:grafana/grafana 2018-12-31 09:00:39 +01:00
Torkel Ödegaard 8a2d1b98e9 Removed rxjs compat 2018-12-31 08:57:01 +01:00
Torkel Ödegaard e18256e417 Merge branch 'rxjs-update' of https://github.com/simPod/grafana into simPod-rxjs-update 2018-12-31 08:40:24 +01:00
Torkel Ödegaard 983b85139c Merge pull request #14665 from bergquist/sqlite_cache_mode_setting 
WIP: makes cache mode configurable
 2018-12-31 08:35:27 +01:00
Torkel Ödegaard 6eb9f83647 Merge pull request #14678 from bergquist/set_orgid_for_provisioned_dashboards 
Adds orgId to user dto for provisioned dashboards
 2018-12-31 08:34:01 +01:00
Daniel Lee ce50e9331a ldap: adds extra debug logging 2018-12-30 22:53:00 +01:00
bergquist 9895b1e6d0 adds orgId to user dto for provisioned dashboards 2018-12-28 10:49:00 +01:00
Simon Podlipsky d42f821c87 Update rxjs 2018-12-27 20:37:44 +01:00
Carl Bergquist 136f6986e1 Merge pull request #14666 from bergquist/close_body 
Closes the body properly on successful webhooks
 2018-12-27 16:22:39 +01:00
bergquist 24636da800 closes the body properly on successful webhooks 
this commit also adds a test docker container
for receiving alerting web hook requests
 2018-12-27 16:08:13 +01:00
Carl Bergquist b798a5412b Merge pull request #14661 from pfree/fix_typo 
Fix general tab typos
 2018-12-27 14:31:08 +01:00
bergquist 74124ec8ed makes cache mode configurable 
this makes the cache mode in the sqlite connection
string configurable. the default also changed from
shared to private to solve #107272 but allow the user
to use shared if performance is more important.

ref #10727
 2018-12-27 10:48:11 +01:00