Commit Graph

19519 Commits

Author SHA1 Message Date
Hugo Häggmark
42f700054f Fixed position of Closesplit 2019-01-28 12:47:01 +01:00
Hugo Häggmark
d2a5477654 Fixed small issue with TimePicker dropdown position 2019-01-28 12:47:01 +01:00
Hugo Häggmark
032a82feed Simplified some styles and dom elements 2019-01-28 12:47:01 +01:00
Hugo Häggmark
9caaf25078 Fixed some more with the sidemenu open and smaller screens 2019-01-28 12:47:01 +01:00
Hugo Häggmark
b2c284e42c Fixed so heading looks good with closed sidemenu 2019-01-28 12:47:01 +01:00
Hugo Häggmark
ffe03ee22d Restructure of component and styling 2019-01-28 12:47:01 +01:00
Hugo Häggmark
1aefc4cc2d Refactored out ExploreToolbar from Explore 2019-01-28 12:47:01 +01:00
Marcus Efraimsson
c7e50a79d7
changelog: add notes about closing #13929 2019-01-28 11:29:50 +01:00
Marcus Efraimsson
5807fc1383
changelog: add notes about closing #14558 2019-01-28 11:20:23 +01:00
Marcus Efraimsson
c52dde4c1b
changelog: add notes about closing #14484 2019-01-28 11:18:37 +01:00
Marcus Efraimsson
4678f43aeb
changelog: add notes about closing #13765 2019-01-28 11:15:00 +01:00
Marcus Efraimsson
2a0689a1f5
changelog: add notes about closing #11503 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
a9fd076470
changelog: add notes about closing #4075 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
5869eba467
changelog: add notes about closing #14722 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
ec41c4a572
update changelog 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
ac17da624d
changelog: add notes about closing #10322 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
9eddb59705
changelog: add notes about closing #12991 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
1d1d085b96
update changelog 2019-01-28 11:08:16 +01:00
Torkel Ödegaard
642e1115f7
Merge pull request #15076 from grafana/minor-moving-task
Moving a few things from dashboard folder
2019-01-28 10:57:04 +01:00
Carl Bergquist
5082b66e3d
Merge pull request #15078 from grafana/golang_1.11.5
upgrade golang to 1.11.5
2019-01-28 10:20:20 +01:00
Torkel Ödegaard
de79c27bcb Fixed import path 2019-01-28 09:20:54 +01:00
bergquist
019848484b changelog: adds note about closing #14701 2019-01-28 08:35:14 +01:00
Carl Bergquist
711f9bc034
Merge pull request #14883 from sharkpc0813/14701-fix-alert-context
fix that alert context and result handle context do not use the same derived context.
2019-01-28 08:30:45 +01:00
bergquist
0cbc89b063 Merge branch 'master' into 14701-fix-alert-context
* master: (262 commits)
  pkg/services/dashboards/dashboard_service.go: simplify return
  Updated url query param encoding to exctly match angular encoding
  Updated snapshot
  Added missing props not being passed to scrollbar component, fixes #15058
  Document /api/health
  changelog: adds note for #15062
  change default rotate_token_minutes to 10 minutes
  fix
  load test/ha fixes
  set low login cookie rotate time in ha mode
  fix multiple piechart instances bug
  scripts/build/*: Fix some golint issues
  scripts/build/*: Fix golint issues Url => URL
  build: fixes building grafana completely within docker.
  dont specify domain for auth cookies
  New snapshot reflecting changes
  Makes the clickable side menu header look great in light theme again
  org id fix for load test
  user auth token load tests using k6.io
  moves cookie https setting to [security]
  ...
2019-01-28 08:09:52 +01:00
bergquist
d75f53e895 upgrade golang to 1.11.5 2019-01-28 08:08:29 +01:00
bergquist
364154d81f moves timeout tests to an integration test 2019-01-28 07:56:31 +01:00
Carl Bergquist
87d44490e6
Merge pull request #15072 from mjtrangoni/fix-megacheck-issue
pkg/services/dashboards/dashboard_service.go: simplify return
2019-01-27 23:41:37 +01:00
Torkel Ödegaard
7f2c2a913e Moving a few things from dashboard folder 2019-01-27 17:33:13 +01:00
Mario Trangoni
bf90ff87cf pkg/services/dashboards/dashboard_service.go: simplify return
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck  ./...
pkg/services/dashboards/dashboard_service.go:167:2⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
2019-01-26 14:23:10 +01:00
Torkel Ödegaard
84d1ce8fe3
Merge pull request #15071 from grafana/explore-url-fixes
Updated url query param encoding to exctly match angular encoding
2019-01-26 12:41:32 +01:00
Torkel Ödegaard
0975f816aa Updated url query param encoding to exctly match angular encoding 2019-01-26 12:05:37 +01:00
Torkel Ödegaard
7956c74406
Merge pull request #15070 from grafana/scrollbar-fixes
Added missing props not being passed to scrollbar component
2019-01-26 11:48:48 +01:00
Torkel Ödegaard
f3dc5381ee
Merge pull request #15018 from miroswan/14961-constructor-as-rvalue
Bug Fix #14961
2019-01-26 11:11:32 +01:00
Torkel Ödegaard
27858c0272 Updated snapshot 2019-01-26 11:04:50 +01:00
Torkel Ödegaard
c9d060c0fe
Merge pull request #15041 from grafana/14752-explore-custom-scrollbar
Use CustomScrollbar in explore
2019-01-26 10:57:13 +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
Torkel Ödegaard
c748b53f17 Added missing props not being passed to scrollbar component, fixes #15058 2019-01-26 10:51:16 +01:00
Torkel Ödegaard
ecbda1af23
Merge pull request #15068 from finkr/finkr-patch-doc-healthapi
Document /api/health
2019-01-26 07:06:03 +01:00
Torkel Ödegaard
aaad9e3e49
Merge pull request #15057 from grafana/hugoh/sidemenu-dropdown-looks-funky-in-light-theme
Makes the clickable side menu header look great in light theme again
2019-01-26 07:05:28 +01:00
Frank lin Piat
1fc5ea181a
Document /api/health
Document the health check implemented in #3302 (and #935), see  https://github.com/grafana/grafana/issues/3302#issuecomment-297066201
2019-01-25 17:52:28 +01:00
Daniel Lee
d1608510ef changelog: adds note for #15062 2019-01-25 15:52:53 +01:00
Daniel Lee
684b588126
Merge pull request #15062 from alexanderzobnin/fix-piechart
fix multiple piechart instances bug
2019-01-25 15:38:23 +01:00
Carl Bergquist
d5c1f8e526
Merge pull request #14912 from grafana/poc_token_auth
WIP. POC for session replacement base hashed tokens.
2019-01-25 13:58:35 +01:00
Marcus Efraimsson
e4924795a2
change default rotate_token_minutes to 10 minutes 2019-01-25 13:30:26 +01:00
Marcus Efraimsson
42fa41e78d
fix 2019-01-25 13:18:17 +01:00
Marcus Efraimsson
806ddd63a0
load test/ha fixes 2019-01-25 13:16:19 +01:00
bergquist
95d9328c66 set low login cookie rotate time in ha mode 2019-01-25 12:59:50 +01:00
Alexander Zobnin
7fb1b3a11a
fix multiple piechart instances bug 2019-01-25 13:56:00 +03:00
Mario Trangoni
4b68055c16 scripts/build/*: Fix some golint issues
See,

$ gometalinter --vendor --disable-all --enable=golint ./...
build/release_publisher/externalrelease.go:55:6⚠️ type getHttpContents should be getHTTPContents (golint)
build/release_publisher/publisher.go:18:2⚠️ struct field apiUri should be apiURI (golint)
build/release_publisher/publisher.go:66:6⚠️ exported type ReleaseType should have comment or be unexported (golint)
build/release_publisher/publisher.go:69:2⚠️ exported const STABLE should have comment (or a comment on this block) or be unexported (golint)
build/release_publisher/publisher.go:185:16⚠️ should replace errors.New(fmt.Sprintf(...)) with fmt.Errorf(...) (golint)
build/release_publisher/publisher_test.go:102:6⚠️ type mockHttpGetter should be mockHTTPGetter (golint)
2019-01-25 11:21:47 +01:00
Mario Trangoni
d5f63d9988 scripts/build/*: Fix golint issues Url => URL
$ gometalinter --vendor --disable-all --enable=golint ./... | grep -i URL
build/publish.go:18:5⚠️ var apiUrl should be apiURL (golint)
build/publish.go:184:2⚠️ struct field WhatsNewUrl should be WhatsNewURL (golint)
build/publish.go:185:2⚠️ struct field ReleaseNotesUrl should be ReleaseNotesURL (golint)
build/publish.go:191:2⚠️ struct field Url should be URL (golint)
build/release_publisher/externalrelease.go:17:53⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/externalrelease.go:17:69⚠️ method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/externalrelease.go:17:89⚠️ method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/localrelease.go:20:45⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/localrelease.go:20:61⚠️ method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/localrelease.go:20:81⚠️ method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/localrelease.go:45:41⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/localrelease.go:51:84⚠️ func parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/main.go:12:6⚠️ var whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/main.go:13:6⚠️ var releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/main.go:40:6⚠️ var baseUrl should be baseURL (golint)
build/release_publisher/main.go:94:6⚠️ func createBaseUrl should be createBaseURL (golint)
build/release_publisher/publisher.go:21:2⚠️ struct field baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:26:17⚠️ interface method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:26:33⚠️ interface method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher.go:26:53⚠️ interface method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/publisher.go:29:31⚠️ method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher.go:29:51⚠️ method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/publisher.go:91:24⚠️ method getUrl should be getURL (golint)
build/release_publisher/publisher.go:91:31⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:190:15⚠️ func parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:199:21⚠️ method apiUrl should be apiURL (golint)
build/release_publisher/publisher.go:257:2⚠️ struct field WhatsNewUrl should be WhatsNewURL (golint)
build/release_publisher/publisher.go:258:2⚠️ struct field ReleaseNotesUrl should be ReleaseNotesURL (golint)
build/release_publisher/publisher.go:264:2⚠️ struct field Url should be URL (golint)
build/release_publisher/publisher_test.go:10:3⚠️ struct field whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher_test.go:11:3⚠️ struct field relNotesUrl should be relNotesURL (golint)
build/release_publisher/publisher_test.go:17:3⚠️ struct field expectedUrl should be expectedURL (golint)
build/release_publisher/publisher_test.go:18:3⚠️ struct field baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher_test.go:109:2⚠️ var whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher_test.go:110:2⚠️ var relNotesUrl should be relNotesURL (golint)
2019-01-25 11:21:47 +01:00