- Jun 17, 2019
-
-
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)
-
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)
-
Maxim Ivanov authored
(cherry picked from commit 151fe240)
-
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)
-
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)
-
Kyle Brandt authored
fixes setex error with redis on #17377 (cherry picked from commit 826d33ea)
- Jun 05, 2019
-
-
Andrej Ocenas authored
-
Torkel Ödegaard authored
(cherry picked from commit de7856cf)
-
Marcus Efraimsson authored
This makes sure that refresh/update/run query are parsing a relative time range to get proper epoch time range before running queries. Fixes #17322 (cherry picked from commit e951e718)
-
Andrej Ocenas authored
Fix slow ACL query for dashboards that was used as subquery on multiple places slowing down search and login in instances with many dashboards. (cherry picked from commit 1c3ad786)
-
Marcus Efraimsson authored
xorm introduced some changes in https://github.com/go-xorm/xorm/pull/824 and https://github.com/go-xorm/xorm/pull/876 which by default will use public as the postgres schema and this was a breaking change compared to before. Grafana has implemented a custom postgres dialect so above changes wasn't a problem here. However, Grafana's custom database migration was using xorm dialect to check if the migration table exists or not. For those using a custom search_path (schema) in postgres configured on server, database or user level the migration table check would not find the migration table since it was looking in public schema due to xorm changes above. This had the consequence that Grafana's database migration failed the second time since migration had already run migrations in another schema. This change will make xorm use an empty default schema for postgres and by that mimic the functionality of how it was functioning before xorm's changes above. Fixes #16720 Co-Authored-By: Carl Bergquist <carl@grafana.com> (cherry picked from commit b7a95334)
-
Dan Cech authored
* mitigate https://www.owasp.org/index.php/CSV_Injection - prepend csv cell values that begin with -, +, = or @ with ' - trim trailing whitespace from all csv values * test for csv formula injection mitigation (cherry picked from commit 5e753787)
-
Joshua Piccari authored
When accessing the `series` property of query results, if a query is hidden, an exception is thrown. This is caused by lack of checks to verify that the query result exists before accessing the `series` property. Closes #17112 (cherry picked from commit 5fa5d4bd)
-
- May 27, 2019
-
-
Marcus Efraimsson authored
-
Torkel Ödegaard authored
(cherry picked from commit 5358c5fe)
-
Torkel Ödegaard authored
(cherry picked from commit 3dda812f)
-
Andrej Ocenas authored
closes: #17107 (cherry picked from commit 151b24b9)
-
Marcus Efraimsson authored
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
-
Marcus Efraimsson authored
Backports #17275 for v6.2.x
-
Marcus Efraimsson authored
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
-
Marcus Efraimsson authored
-
Tim Butler authored
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 df6a4914)
-
Torkel Ödegaard authored
Fixes #17237 (cherry picked from commit 6acc7d37)
-
Brian Gann authored
(cherry picked from commit 972df40a)
-
Hugo Häggmark authored
Fixes: #17071 (cherry picked from commit fdd421e2)
-
- May 22, 2019
-
-
Torkel Ödegaard authored
(cherry picked from commit e4217239)
-
Daniel Lee authored
* azuremonitor: revert to clearing chained dropdowns After feedback from users, changing back to clearing dropdowns to the right in the chain. E.g. if the user changes the subscription dropdown which is first in the chain then all the dependent dropdowns to the right should be cleared (reset to default values). Also, now triggers getting subscriptions every time the dropdown menu is shown rather than just the first time. It is apparently common to add subscriptions while building queries. (cherry picked from commit 577beebc)
-
Torkel Ödegaard authored
(cherry picked from commit a96b522a)
-
- May 21, 2019
-
-
Torkel Ödegaard authored
-
Torkel Ödegaard authored
-
Ryan McKinley authored
* add an option to get hidden queries * make sure you have meta * supportsHiddenQueries * remove spaces * DataSources: hidden queries flag (cherry picked from commit 1033f0f9)
-
Dominik Prokop authored
* Apply panel options defaults on panel init and on save model retrieval * Remove unnecessary argument, added tests * Make FieldPropertiesEditor statefull to enable onBlur changes * Remove unnecessary import * Post-review updates Fixes #17154 (cherry picked from commit 73e4178a)
-
Torkel Ödegaard authored
(cherry picked from commit 87403999)
-
Daniel Lee authored
* fix: azuremonitor adds multi-sub support to alerting * fix: AzureMonitor missing parameter in metadata func getMetricMetadata function when called in the query ctrl was missing a parameter for Subscription Id. Also, made some tweaks to what happens when a chained dropdown is changed to not reset all the fields that are dependent on it. (cherry picked from commit fa9ffe38)
-
Brian Gann authored
* build: generate sha256 during msi build (cherry picked from commit f98095d6)
-
Torkel Ödegaard authored
* Release: Improved cherry pick task * Minor tweak to formatting (cherry picked from commit 058f5a16)
-
- May 15, 2019
-
-
Torkel Ödegaard authored
-
Torkel Ödegaard authored
-
Carl Bergquist authored
* remotecache: avoid race condition in set since set called the database twice without transactions another operation could insert a value before the first operation completed. which would raise an error on insert since the data have been inserted by the other request. closes #17079 (cherry picked from commit aed3d0d3)
-