3
0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Commit Graph

18758 Commits

Author SHA1 Message Date
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
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 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 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 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 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  but allow the user
to use shared if performance is more important.

ref 
2018-12-27 10:48:11 +01:00
Patrick Freeman
ca7f75f353 Fix general tab typos 2018-12-26 13:36:12 -05:00
Torkel Ödegaard
8a976f5cb4
Merge pull request from grafana/husky-and-sasslint-fixes
Husky and sasslint fixes
2018-12-26 08:13:35 +01:00
Torkel Ödegaard
9cd449ed52 added node-sass as dev dependency, needed after I removed grunt-sass 2018-12-25 21:11:18 +01:00
Torkel Ödegaard
ce0dcd5cab Husky and sasslint fixes, fixes 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
98d26354c1 Added a form component to @grafana/ui 2018-12-25 11:42:23 +01:00
Torkel Ödegaard
2dfa3269c3 created visualizations folder 2018-12-25 10:20:20 +01:00
Torkel Ödegaard
493714c27d Fixed JQuery typing issues 2018-12-25 09:59:23 +01:00
Torkel Ödegaard
19da963a19 Typings issues 2018-12-25 08:55:44 +01:00
Torkel Ödegaard
a38490f4b2 wip: moving react graph component to grafana/ui 2018-12-24 14:14:06 +01:00
Torkel Ödegaard
513434cada
Merge pull request from grafana/test-frontend-change
Don't do a full frontend release build in test-frontend
2018-12-24 12:37:17 +01:00
Torkel Ödegaard
21a25f2c27 Don't do a full frontend release build in test-frontend job, added typescheck (tsc noEmit) instead, fixes 2018-12-24 07:12:49 +01:00
Torkel Ödegaard
4b323d9879 Moved sass for component to @grafana/ui lib 2018-12-24 07:05:18 +01:00
Torkel Ödegaard
17de1f2887
Merge pull request from grafana/fix-dashboard-links
Fixed dashboard links not updating after variable or time range change
2018-12-23 20:41:51 +01:00
Torkel Ödegaard
0fd403a783
Merge pull request from grafana/explore-options-margin-increase
Increased margin between controls in logs panel
2018-12-23 17:45:49 +01:00
Torkel Ödegaard
a02b4b47b6 Moving a couple of types to @grafana/ui 2018-12-23 09:15:32 +01:00
Torkel Ödegaard
0ff572efbf Testing moving out one type to grafana/ui 2018-12-23 08:28:37 +01:00
Torkel Ödegaard
270d52495d Increased margin between controls in logs panel, fixes 2018-12-23 07:18:11 +01:00
Torkel Ödegaard
002f57ae00 Fixed dashboard links not updating after variable or time range change, fixes 2018-12-23 07:11:24 +01:00
Torkel Ödegaard
4bb8249ffc
Merge pull request from cykl/influxdb-timezone-clause
Add support for InfluxDB's time zone clause
2018-12-23 07:03:48 +01:00
Torkel Ödegaard
a138bf27d1
Merge pull request from jacobrichard/master
Update/Improve Docs for Auth Proxy Whitelist
2018-12-23 07:01:41 +01:00
Torkel Ödegaard
ef219dd72b
Merge pull request from grafana/fix-tooltip-placement
Fixed group button tooltip placement from auto to bottom
2018-12-23 07:00:56 +01:00
Torkel Ödegaard
41712c3957 Fixed group button tooltip placement from auto to bottom, fixes 2018-12-23 06:46:26 +01:00
Jacob Richard
47c0b5770b Removing erroneous backtick in docs 2018-12-22 18:18:15 -06:00
Jacob Richard
b785b06598 Updating docs for auth_proxy whitelist CIDR support 2018-12-22 18:17:32 -06:00
David
b05e7aaecb
Merge pull request from grafana/davkal/fix-14635
Loki: fix timestamp field
2018-12-22 17:52:59 +01:00
David Kaltschmidt
d1dec8bd44 Add timestamp back to log entry type 2018-12-22 17:36:35 +01:00
Dan Cech
b8fdacd81f
Update public/app/plugins/datasource/loki/result_transformer.ts
Co-Authored-By: davkal <david.kaltschmidt@gmail.com>
2018-12-22 17:28:51 +01:00
David Kaltschmidt
e694604be5 Loki: fix timestamp field
- timestamp was renamed to `ts` in 
- renamed here in result transformer and tests
2018-12-22 17:19:58 +01:00
David
b2401e37fa
Merge pull request from grafana/davkal/explore-logging-search
Explore: Split logging query into selector and search
2018-12-22 17:00:57 +01:00
Torkel Ödegaard
f8e2e11734
Merge pull request from grafana/firefox-height-bugfix
Fixed panel height & scroll issue with flexbox in firefox,
2018-12-22 09:54:58 +01:00
Torkel Ödegaard
9aa2764753 Fixed panel height & scroll issue with flexbox in firefox, fixes 2018-12-22 08:58:08 +01:00
Clément MATHIEU
c29c9d1664 Add support for InfluxDB's time zone clause (backend) 2018-12-21 16:49:01 +01:00
Torkel Ödegaard
7268f16c54 grunt test task update 2018-12-21 14:37:38 +01:00
Jürgen Kreileder
41eb0ba52e Add support for InfluxDB's time zone clause 2018-12-21 14:37:02 +01:00
Torkel Ödegaard
52f583fee7 @grafana/ui lib now contains one components, seperate lint & tsc steps 2018-12-21 14:23:32 +01:00
Marcus Efraimsson
8b4083a602
changelog: add notes about closing 2018-12-21 13:01:25 +01:00