Skip to content
Snippets Groups Projects
  1. Jun 17, 2019
    • gotjosh's avatar
      release 6.2.3 · 8a30e47a
      gotjosh authored
      v6.2.3
      8a30e47a
    • gotjosh's avatar
      cli: grafana-cli should receive flags from the command line (#17606) · 7c176cfa
      gotjosh authored
      grafana-cli should allow configuration overrides to be received from the command line. e.g.
      
      ```
      grafana-cli admin reset-password cfg:default.paths.logs=custom/log/directory/
      ```
      
      Seems like we missed the inclusion of `flag.Parse` as we run the command,  to be able to consume them.
      
      Additionally, it'll be useful for the user to know whenever these are being overriden or not - hence the addition of logging the configuration to be used as we run the command.
      
      (cherry picked from commit 6fbca902)
      7c176cfa
    • Sofia Papagiannaki's avatar
      AuthProxy: Optimistic lock pattern for remote cache Set (#17485) · 053f5f5d
      Sofia Papagiannaki authored
      * Implementation of optimistic lock pattern
      
      Try to insert the remote cache key and handle integrity error
      
      * Remove transaction
      
      Integrity error inside a transaction results in deadlock
      
      * Remove check for existing remote cache key
      
      Is no longer needed since integrity constrain violations are handled
      
      * Add check for integrity constrain violation
      
      Do not update the row if the insert statement fails
      for other than an integrity constrain violation
      
      * Handle failing inserts because of deadlocks
      
      If the insert statement fails because of a deadlock
      try to update the row
      
      * Add utility function for returning SQL error code
      
      Useful for debugging
      
      * Add logging for failing expired cache key deletion
      
      Do not shallow it completely
      
      * Revert "Add utility function for returning SQL error code"
      
      This reverts commit 8e0b82c79633e7d8bc350823cbbab2ac7a58c0a5.
      
      * Better log for failing deletion of expired cache key
      
      * Add some comments
      
      * Remove check for existing cache key
      
      Attempt to insert the key without checking if it's already there
      and handle the error situations
      
      * Do not propagate deadlocks created during update
      
      Most probably somebody else is trying to insert/update
      the key at the same time so it is safe enough to ignore it
      
      (cherry picked from commit 7b70e7db)
      053f5f5d
    • Maxim Ivanov's avatar
      OAuth: Fix for wrong user token updated on OAuth refresh in DS proxy (#17541) · c533ec7d
      Maxim Ivanov authored
      (cherry picked from commit 151fe240)
      c533ec7d
    • Kyle Brandt's avatar
      middleware: add security related HTTP(S) response headers (#17522) · 22a991ff
      Kyle Brandt authored
        * x_xss_protection
        * strict_transport_security (HSTS)
        * x_content_type_options
      
      these are currently defaulted to false (off) until the next minor release.
      
      fixes #17509
      
      (cherry picked from commit 599514ad)
      22a991ff
    • Kyle Brandt's avatar
      remote_cache: Fix redis (#17483) · 91feb801
      Kyle Brandt authored
      * wip: fix remote cache for redis
      connstr parsing and non-negative expires for #17377
      TODO: finish parse, check zero case, find out why negative duration in the first place
      
      * finish parse.
      Still TODO, find out negative value, and decide if would be better to make database specific entries in the .ini file
      
      * update ini files
      
      * remove accidental uncomment in defaults.ini
      
      * auth_proxy: expiration non-negative so expiration is not in the past
      
      * fix test, revert neg in redis
      
      * review: use errutil
      
      (cherry picked from commit c09fe3c3)
      91feb801
    • Kyle Brandt's avatar
      auth_proxy: non-negative cache TTL (#17495) · 9a933823
      Kyle Brandt authored
      fixes setex error with redis on #17377
      
      (cherry picked from commit 826d33ea)
      9a933823
  2. Jun 05, 2019
  3. May 27, 2019
  4. May 22, 2019
  5. May 21, 2019
  6. May 15, 2019
Loading