v6.2.1 cherry picks #17294

marefr · 2019-05-27T09:07:54Z

Changes going into v6.2.1 release:

Explore: Fixes so clicking in a Prometheus Table the query is filtered by clicked value, (Explore: Fixes so clicking in a Prometheus Table the query is filtered by clicked value #17083), merge-sha: fdd421e
fix filter for building msi during release, (fix filter for building msi during release #17236), merge-sha: 972df40
Singlestat: Fixes issue with value placement and line wraps, (Singlestat: Fixes issue with value placement and line wraps #17249), merge-sha: 6acc7d3
Update: Update jQuery to 3.4.1 to fix issue on iOS 10 based browers as well as Chrome 53.x , (Tech: Update jQuery to 3.4.1 to fix issue on iOS 10 based browsers as well as Chrome 53.x #17290), merge-sha: df6a491
CLI: Add command to migrate all datasources to use encrypted password fields , (CLI: Add command to migrate all datasources to use encrypted password fields #17118), merge-sha: 151b24b
Chore: Update jquery to 3.4.1 in grafana ui, (Chore: Update jquery to 3.4.1 in grafana ui #17295), merge-sha: 3dda812
Gauge/BarGauge: Improvements to auto value font size , (Gauge/BarGauge: Improvements to auto value font size #17292), merge-sha: 5358c5f

Backports:

Auth Proxy: Resolve database is locked errors (Auth Proxy: Resolve database is locked errors #17274)
Auth Proxy: Log any error in middleware (Backport: #17275 #17296)
Database: Retry transaction if sqlite returns busy error (Backport: #17276 #17297)
Backport parts of backend: replace /pkg/errors with errutil #17065

…#17083) Fixes: #17071 (cherry picked from commit fdd421e)

(cherry picked from commit 972df40)

Fixes #17237 (cherry picked from commit 6acc7d3)

Fixes #17289 Special notes for your reviewer: Updates jQuery to 3.4.1 (from 3.4.0) to fix the jQuery bug: https://blog.jquery.com/2019/05/01/jquery-3-4-1-triggering-focus-events-in-ie-and-finding-root-elements-in-ios-10/ (cherry picked from commit df6a491)

The change was originally made in #16950, but that change was too big to cherry pick. This change adds a major database performance improvement since the number of selects to fetch a cached item is drastically decreased and by that removes sqlite database is locked errors. Fixes #17247

Backports #17275 for v6.2.x

Adds an additional sqlite error code 5 (SQLITE_BUSY) to the transaction retry handler to add retries when sqlite returns database is locked error. More info: https://www.sqlite.org/rescode.html#busy Backports #17276 for v6.2.x

bergquist · 2019-05-27T10:42:11Z

missing #17118

marefr · 2019-05-27T10:45:59Z

Yes I know @bergquist, but don't think it was merged when I did the cherry pick. Going to try again.

… fields (#17118) closes: #17107 (cherry picked from commit 151b24b)

(cherry picked from commit 3dda812)

(cherry picked from commit 5358c5f)

marefr · 2019-05-27T12:11:52Z

Got "too many files open" error for one proxy request error, but besides that no "database is locked" errors.

> ./run.sh -d 15m -v 20 -c auth_proxy_test -u http://127.0.0.1:10080/grafana

          /\      |‾‾|  /‾‾/  /‾/   
     /\  /  \     |  |_/  /  / /    
    /  \/    \    |      |  /  ‾‾\  
   /          \   |  |‾\  \ | (_) | 
  / __________ \  |__|  \__\ \___/ .io

  execution: local
     output: -
     script: src/auth_proxy_test.js

    duration: 15m0s, iterations: -
         vus: 20,    max: 20

    done [==========================================================] 15m0s / 15m0s

    █ auth proxy test

      █ batch proxy requests

        ✗ response status is 200
         ↳  99% — ✓ 275999 / ✗ 1

    checks.....................: 99.99% ✓ 275999 ✗ 1
    data_received..............: 5.3 GB 5.9 MB/s
    data_sent..................: 86 MB  96 kB/s
    group_duration.............: avg=14.5s    min=761.72ms med=15.04s   max=24.33s   p(90)=18.1s   p(95)=19.05s
    http_req_blocked...........: avg=156.69µs min=758ns    med=2.75µs   max=174.56ms p(90)=4.74µs  p(95)=411.75µs
    http_req_connecting........: avg=142.49µs min=0s       med=0s       max=174.5ms  p(90)=0s      p(95)=304.21µs
    http_req_duration..........: avg=929.65ms min=1.45ms   med=975.68ms max=3.57s    p(90)=1.35s   p(95)=1.5s
    http_req_receiving.........: avg=53.05µs  min=9.29µs   med=40.33µs  max=32.03ms  p(90)=58.66µs p(95)=70.51µs
    http_req_sending...........: avg=62.75µs  min=5.54µs   med=21.76µs  max=135.22ms p(90)=35.51µs p(95)=69.83µs
    http_req_tls_handshaking...: avg=0s       min=0s       med=0s       max=0s       p(90)=0s      p(95)=0s
    http_req_waiting...........: avg=929.53ms min=1.4ms    med=975.59ms max=3.57s    p(90)=1.35s   p(95)=1.5s
    http_reqs..................: 278517 309.463306/s
    iteration_duration.........: avg=19.45s   min=2.15µs   med=20.02s   max=29.33s   p(90)=23.11s  p(95)=24.05s
    iterations.................: 912    1.013333/s
    vus........................: 20     min=20   max=20
    vus_max....................: 20     min=20   max=20

bergquist · 2019-05-27T12:14:23Z

@marefr could you please try cherry-picking #17213 ?
commit: 3ff3e0f
https://github.com/grafana/grafana/pull/17213/files#diff-21f89324b16a1ac91222160b871178bbR319

might help

marefr · 2019-05-27T12:16:30Z

@bergquist I don't see how those changes has any effect in the datasource proxy?

bergquist · 2019-05-27T12:18:48Z

Absolutely true.

Weird. Never seen too many files open during load testing. Not a blocker in this case.

bergquist

LGTM

I guess we should rebase this instead of squashing? :)

marefr · 2019-05-27T12:20:18Z

Yes we should 👍

hugohaggmark and others added 8 commits May 27, 2019 10:58

Explore: Fixes filtering in Prometheus queries when clicking in Table (…

4c09c33

…#17083) Fixes: #17071 (cherry picked from commit fdd421e)

Build: Fix filter for building msi during release (#17236)

c222d8e

(cherry picked from commit 972df40)

Singlestat: fixes issue with value placement and line wraps (#17249)

dc13655

Fixes #17237 (cherry picked from commit 6acc7d3)

release v6.2.1

0f0a661

auth proxy: log any error in middleware (#17296)

d9e85d2

Backports #17275 for v6.2.x

aocenas and others added 3 commits May 27, 2019 12:47

CLI: Add command to migrate all datasources to use encrypted password…

63f35c1

… fields (#17118) closes: #17107 (cherry picked from commit 151b24b)

Chore: Update jquery to 3.4.1 in grafana ui (#17295)

6f7f983

(cherry picked from commit 3dda812)

Gauge/BarGauge: font size improvements (#17292)

1aa6abe

(cherry picked from commit 5358c5f)

marefr marked this pull request as ready for review May 27, 2019 10:48

marefr requested a review from bergquist May 27, 2019 10:48

backport parts of #17065

8ff4f54

bergquist approved these changes May 27, 2019

View reviewed changes

marefr merged commit 9e40b07 into v6.2.x May 27, 2019

marefr deleted the cp-6.2.1 branch May 27, 2019 12:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

v6.2.1 cherry picks #17294

v6.2.1 cherry picks #17294

marefr commented May 27, 2019 •

edited

Loading

bergquist commented May 27, 2019

marefr commented May 27, 2019

marefr commented May 27, 2019

bergquist commented May 27, 2019

marefr commented May 27, 2019

bergquist commented May 27, 2019

bergquist left a comment

marefr commented May 27, 2019

v6.2.1 cherry picks #17294

v6.2.1 cherry picks #17294

Conversation

marefr commented May 27, 2019 • edited Loading

bergquist commented May 27, 2019

marefr commented May 27, 2019

marefr commented May 27, 2019

bergquist commented May 27, 2019

marefr commented May 27, 2019

bergquist commented May 27, 2019

bergquist left a comment

Choose a reason for hiding this comment

marefr commented May 27, 2019

marefr commented May 27, 2019 •

edited

Loading