public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 51a95963f3 Merge pull request #14020 from grafana/12759-timeshift 
12759 timeshift and panelTimeOverrides
 2018-11-13 16:26:30 +01:00
Torkel Ödegaard 6d91e06f4d refactoring back the interval calculation, needs to be different for react panels 2018-11-13 16:01:52 +01:00
Torkel Ödegaard f026be3790 fix case where timeshift and time override is used 2018-11-13 15:23:13 +01:00
Torkel Ödegaard f274195d81 wip: refactoring interval and time override handling 2018-11-13 15:05:07 +01:00
Carl Bergquist 81a5b90022 Merge pull request #14043 from bergquist/upgrade_macaron_session 
Upgrades the go-macaroon package
 2018-11-13 14:42:06 +01:00
bergquist a0496d554a updates latest to 5.3.4 2018-11-13 14:04:28 +01:00
bergquist 3a672c6dc2 changelod: add release date for 5.3.3 and 5.3.4 2018-11-13 13:58:35 +01:00
Marcus Efraimsson e8e189d111 devenv: graph time regions test dashboard 2018-11-13 12:39:10 +01:00
Marcus Efraimsson 63be43e3b2 graph: Time region support 2018-11-13 12:23:06 +01:00
David Kaltschmidt 7627de80f2 Explore: Fix table pagination styles 
- get rid of drop shadow
- get rid of top border
- add min height for better no-data placement
- add margins
 2018-11-13 11:00:32 +00:00
Marcus Efraimsson 1958de7220 devenv: update alerting with testdata dashboard 2018-11-13 11:51:06 +01:00
Erik Sundell 2e0cbe75ee stackdriver: use arrow functions 2018-11-13 11:06:08 +01:00
Erik Sundell e698202fae stackdriver: use new naming convention for query editor all over 2018-11-13 10:57:10 +01:00
Marcus Efraimsson aa47f80fd8 Merge pull request #14042 from grafana/restore_prefs_control 
Restore user profile preferences
 2018-11-13 01:42:51 -08:00
bergquist 5954ab2c0d adds redis devenv block 2018-11-13 10:27:57 +01:00
Marcus Efraimsson 69a57850c4 restore user profile preferences 2018-11-13 10:22:02 +01:00
Torkel Ödegaard d49e857bc0 Merge branch 'develop' into 12759-timeshift 2018-11-13 09:56:58 +01:00
Torkel Ödegaard 700c9642db Merge pull request #14039 from grafana/minor-react-panels-refactor 
minor react panels refafactor
 2018-11-13 09:55:48 +01:00
Marcus Efraimsson 97c6f3560c changelog: add notes about closing #13328 #13949 
[skip ci]
 2018-11-13 09:44:35 +01:00
bergquist d5555f123f updates macaron session package 2018-11-13 09:41:36 +01:00
Torkel Ödegaard 81a9a3a3c1 Merge branch 'develop' into 12759-timeshift 2018-11-13 08:51:48 +01:00
Torkel Ödegaard 7b805bdb81 minor react panels refafactor 2018-11-13 08:40:42 +01:00
Torkel Ödegaard 6b2a47f2af Merge pull request #14038 from grafana/plugin-not-found 
Plugin not found
 2018-11-13 08:25:47 +01:00
Torkel Ödegaard e331d24a38 removed console.log 2018-11-13 08:11:03 +01:00
Torkel Ödegaard 9820c7806c some cleanup of unused stuff and type fixes 2018-11-13 08:09:12 +01:00
Torkel Ödegaard 9dbb0db684 completed work on panel not found view 2018-11-13 07:54:02 +01:00
Torkel Ödegaard 68eecf6ca6 Merge pull request #14037 from matschaffer/patch-2 
Clarify wording of playlist protip
 2018-11-13 07:04:27 +01:00
Mat Schaffer f6313fe675 Clarify wording of playlist protip 
Per discussion on https://github.com/grafana/grafana/commit/154fbe2413f9abe33157baa563e42fbf67e2f27b#r31238888 it seemed like this wording might be easier to understand.
 2018-11-13 14:56:32 +09:00
Marcus Efraimsson 1194ff282e team preferences ui 2018-11-12 20:58:59 +01:00
Marcus Efraimsson 5f9fecd254 feat: team preferences 2018-11-12 20:01:53 +01:00
David Kaltschmidt 9b48338d95 Explore: Dont set datasource in state if navigated away 
Datasource selection triggers a connection test, on success
the DS is set in the Explore state. If the test takes long and user
selects a different DS, and just after that the first test succeeds,
then the first DS overwrites the state.

* when test returns check if datasource is still the requested one
 2018-11-12 18:06:12 +00:00
David Kaltschmidt ff0ed06441 Explore: Don't suggest term items when text follows 
Tab completion gets in the way when constructing a query from the inside
out:

```
up| => |up => sum(|up)
```

At that point the language provider will not suggest anything.
 2018-11-12 17:40:05 +00:00
Torkel Ödegaard 119e94f745 wip: panel plugin not found 2018-11-12 17:54:44 +01:00
Torkel Ödegaard 7a30220d01 fixed scrollbar autohide prop 2018-11-12 17:48:10 +01:00
Torkel Ödegaard 727efa5a03 Merge branch 'pane-edit-ux-tabs' into develop 2018-11-12 16:25:13 +01:00
Torkel Ödegaard e0feb72637 Merge remote-tracking branch 'origin/data-source-settings-to-react' into develop 2018-11-12 16:17:05 +01:00
Torkel Ödegaard a2a4458923 Merge pull request #14023 from grafana/gauge-panel 
React Gauge Panel - first step
 2018-11-12 15:58:54 +01:00
Johannes Schill 6d4d7c5032 wip: panel-header: On panel refresh, get new timeRange from timeSrv, not the old one from the state 2018-11-12 11:38:41 +01:00
Johannes Schill e045169094 wip: panel-header: Avoid null returning to get better code readability. High five @ peterholmberg 2018-11-12 11:31:33 +01:00
Johannes Schill a3f1a1c6b3 wip: panel-header: Remove the TimeData type 2018-11-12 11:31:33 +01:00
Johannes Schill 8117a7559f wip: panel-header: Add proper typings to maxDataPoints and interval + remove code in comment 2018-11-12 11:31:33 +01:00
Johannes Schill e55f3f883f wip: panel-header: Move getResolution and calculateInterval into utils-functions and use the same code from react and angular 2018-11-12 11:31:33 +01:00
Johannes Schill 9fd62b80d9 wip: panel-header: Start implementing the applyPanelTimeOverrides in the react panels by moving it to a util, make it pure and call it from angular and react. 2018-11-12 11:31:33 +01:00
Peter Holmberg 490fb9e8e6 import changes 2018-11-12 11:25:47 +01:00
Carl Bergquist fdbea75775 Merge pull request #14021 from mjtrangoni/fix-gofmt-issues 
Fix gofmt issues
 2018-11-12 11:22:12 +01:00
Peter Holmberg 9f1784d0e5 updated text styling when switching views 2018-11-12 10:59:35 +01:00
Mario Trangoni 89cd74715e Add gofmt -s to CircleCI 2018-11-12 10:51:43 +01:00
bergquist 2fb78a50d6 minor fixes based on code review 2018-11-12 10:50:56 +01:00
Mario Trangoni 8c04926326 Fix gofmt issues 
See,
$ gometalinter --disable-all --enable=gofmt --deadline 10m --vendor ./...
build.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/externalrelease.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/localrelease.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/main.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/publisher_test.go:1:⚠️ file is not gofmted with -s (gofmt)
 2018-11-12 10:47:27 +01:00
Torkel Ödegaard 46ebe245ab Merge pull request #13999 from roidelapluie/originreferer 
Remove Origin and Referer while proxying requests
 2018-11-11 17:49:15 +01:00