IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 12:44:10 -06:00
Code Issues Packages Projects Releases Wiki Activity
21,986 Commits 5,113 Branches 538 Tags 1.9 GiB
60ddad8fdb
Commit Graph

21986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Zobnin
60ddad8fdb
Batch disable users (#17254) 
* batch disable users

* batch revoke users tokens

* split batch disable user and revoke token

* fix tests for batch disable users

* Chore: add BatchDisableUsers() to the bus
 2019-05-31 13:22:22 +03:00
Marcus Efraimsson
1497f3d79a
Chore: Remove unused properties in explore (#17359) 
This removes unused properties in explore and datasource 
meta data (tables and explore properties in plugin.json).
 2019-05-31 09:45:53 +02:00
Bernard Duggan
a0bb01103e MySQL/Postgres/MSSQL: Add parsing for day, weeks and year intervals in macros (#13086) 
closes #11431
 2019-05-30 09:58:29 +02:00
Dan Cech
5e7537878e Security: Prevent csv formula injection attack (#17363) 
* 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
 2019-05-30 07:07:19 +02:00
Oleg Gaidarenko
a3092dc57b
LDAP: remove unused function (#17351) 2019-05-29 16:12:42 +03:00
Oleg Gaidarenko
d4ef19737e
Enterprise: remove gofakeit dep (#17344) 
* Enterprise: remove gofakeit dep

Since we decided to use our uuid generation inside util module

* Enterprise: result of execution of `go mod ...`
 2019-05-29 15:55:51 +03:00
Marcus Efraimsson
e951e71843
Explore: Update time range before running queries (#17349) 
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
 2019-05-29 13:47:05 +02:00
Oleg Gaidarenko
0a92de623d
Build(package.json): improve npm commands (#17022) 
Remove some of the repetitions in the npm commands
 2019-05-29 11:54:07 +03:00
Carl Bergquist
fd741cbea4 Chore: upgrade webpack analyser (#17340) 
* webpack: upgrade webpack analyser
* yarn.lock update
 2019-05-29 10:27:57 +02:00
Torkel Ödegaard
afbdfe7cb4
NewDataSourcePage: Add Grafana Cloud link (#17324) 
* NewDataSource: adding initial grafana cloud link

* Minor update

* Updated
 2019-05-29 09:37:29 +02:00
Joshua Piccari
5fa5d4bdd5 CloudWatch: Avoid exception while accessing results (#17283) 
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
 2019-05-29 09:10:09 +02:00
Oleg Gaidarenko
a1a498f96c
Build: ignore absence of docker-compose (#17331) 
If devenv/docker-compose.yaml file is missing, `devenv-down`
and subsequently `devenv` is not going to work
 2019-05-28 20:08:27 +03:00
Oleg Gaidarenko
9ff44b5037
Build(makefile): improve error handling (#17281) 
* Build(makefile): improve error handling

Ref baa55ab6ae
 2019-05-28 19:32:14 +03:00
Marcus Efraimsson
1e508d7288
adds auth example for the cli cherrypick task (#17307) 2019-05-28 16:34:28 +02:00
Carl Bergquist
2dc660d533
docs: remove my email from docs examples (#17325) 
I dont want emails from companies who test
alert notifiers :)
 2019-05-28 16:02:14 +02:00
Shavonn Brown
27874a1881 16365 change clashing variable names (#17140) 
* Fix: change  and  to  and  so not clashing with grafana vars (#16365)

* Fix: change  and  to  and  so not clashing with grafana vars (#16365)

* Fix: update now to datetime (#16365)

* Fix: test should look for datetime instead of now (#16365)

* Fix: _az suffix to datasource convention (#16365)

* Fix: convert vars to macro, update doc (#16365)

* Fix: convert vars to macro, update doc (#16365)

* Fix: remove support for time vars (#16365)

* Fix: confilct from master

* add migration on editor open

* fix migration var name
 2019-05-28 15:04:42 +02:00
Ryan McKinley
382ebd6362 Frontend/SeriesData: Fix for convert SeriesData to Table format (#17314) 2019-05-28 10:18:09 +02:00
Šimon Podlipský
4b0ad174ff Frontend/utils: Import has only from lodash (#17311) 2019-05-28 10:17:03 +02:00
Šimon Podlipský
83af1bdff3 Frontend/utils: Add missing type (#17312) 2019-05-28 10:13:49 +02:00
Marcus Efraimsson
83187fd8ea
update v6.2-beta1 changelog with missing pr (#17308) 2019-05-28 09:06:30 +02:00
Marcus Efraimsson
a07296bf24
explore: don't parse log levels if provided by field or label (#17180) 
If a field or a label named level is returned from datasource that is 
used as log level for the logs result instead of parsing the log level 
from the message.

Closes #17122
 2019-05-27 18:43:04 +02:00
Abhilash Gnan
04d473b3e5 HTTP Server: Serve Grafana with a custom URL path prefix (#17048) 
Adds a new [server] setting `serve_from_sub_path`. By enabling 
this setting and using a subpath in `root_url` setting, e.g.
`root_url = http://localhost:3000/grafana`, Grafana will be accessible 
on `http://localhost:3000/grafana`. By default it is set to `false` 
for compatibility reasons.

Closes #16623
 2019-05-27 17:47:29 +02:00
Marcus Efraimsson
b547a0cb34
update latest.json to latest stable version (#17306) 2019-05-27 16:15:25 +02:00
Marcus Efraimsson
0b3768e551
release: v6.2.1 changelog update (#17303) 2019-05-27 14:59:42 +02:00
Hugo Häggmark
4965e10db1
Build: Removes e2e-tests from Grafana master workflow (#17301) 2019-05-27 13:16:33 +02:00
Oleg Gaidarenko
2146f837cf
Build(devenv): correct the context issue (#17291) 
With the previous configuration `docker-compose build` was always failing.
This moves the dockerfiles in the parent dir and changes paths as a result.

Ref moby/moby#2745
 2019-05-27 14:05:32 +03:00
Hugo Häggmark
db32c7dcf5
Build: Enables end-to-end tests in build-master workflow (#17268) 
* Fix: Adds back necessary aria-labels for e2e tests

* Build: Adds end-to-end-tests job to build-master workflow

* Build: Changes grafana image used
 2019-05-27 12:22:43 +02:00
Torkel Ödegaard
5358c5fe6b
Gauge/BarGauge: font size improvements (#17292) 2019-05-27 12:13:08 +02:00
Torkel Ödegaard
3dda812f12
Chore: Update jquery to 3.4.1 in grafana ui (#17295) 2019-05-27 11:48:17 +02:00
Andrej Ocenas
151b24b95f CLI: Add command to migrate all datasources to use encrypted password fields (#17118) 
closes: #17107
 2019-05-27 10:47:21 +02:00
Marcus Efraimsson
b9181df212
Auth Proxy: Log any error in middleware (#17275) 
Fixes so that errors happening in auth proxy middleware is logged.

Ref #17247
 2019-05-27 10:38:17 +02:00
Marcus Efraimsson
1a2841e244
devenv: metricbeat and kibana for elasticsearch 7 block (#17262) 2019-05-27 09:55:58 +02:00
Oleg Gaidarenko
de92c360a1
LDAP: reduce API and allow its extension (#17209) 
* Removes Add/Remove methods

* Publicise necessary fields and methods so we could extend it

* Publicise mock API

* More comments and additional simplifications

* Sync with master

Still having low coverage :/ - should be addressed in #17208
 2019-05-27 10:36:49 +03:00
Marcus Efraimsson
5884e235fc
database: retry transaction if sqlite returns database is locked error (#17276) 
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

Ref #17247 #16638
 2019-05-27 09:24:15 +02:00
Tim Butler
df6a4914c4 Tech: Update jQuery to 3.4.1 (#17290) 
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/
 2019-05-27 07:11:30 +02:00
olcbean
07d37b4a92 fix typo in basic_concepts.md (#17285) 2019-05-25 20:41:25 +02:00
Oleg Gaidarenko
baa55ab6ae
Feature: do dev environment via makefile (#17136) 
Simplifies dev environment creation. I also planing to utilize
this logic for the LDAP benchmarking
 2019-05-25 04:38:01 +03:00
Marcus Efraimsson
bc3a718107
devenv: adds auth proxy load test (#17271) 2019-05-24 17:51:10 +02:00
Ryan McKinley
2a52dbfb74
Table: various minor fixes (alpha panel) (#17258) 2019-05-24 08:49:17 -07:00
Torkel Ödegaard
6acc7d37da Singlestat: fixes issue with value placement and line wraps (#17249) 
Fixes #17237
 2019-05-24 08:52:47 +02:00
Dominik Prokop
a7aaed49b5
Devenv: Update Graphite port in dev datasources (#17255) 2019-05-24 08:09:51 +02:00
Ryan McKinley
b0ea3a8c88
Chore: bump grafana-ui version (#17256) 2019-05-23 11:03:10 -07:00
Torkel Ödegaard
0d6c9d371f
Release: Updated latest.json 2019-05-23 19:56:16 +02:00
Alexander Zobnin
a3a7916597
Auth: Logout disabled user (#17166) 
* Feature: revoke user token when disabled

* Chore: fix linter error
 2019-05-23 15:54:47 +03:00
Carl Bergquist
c87b2c9913
docs: fixes typo in provisioning docs (#17248) 
closes #17196
 2019-05-23 13:06:34 +02:00
Utkarsh Bhatnagar
8e434ad163 CloudWatch: Made region visible for AWS Cloudwatch Expressions (#17243) 
Fixes #14933
 2019-05-23 12:02:19 +02:00
Filip Barl
a04bf0cded Panel: Pass transparency prop down to React panels. (#17235) 2019-05-23 11:58:50 +02:00
Brian Gann
972df40af8 Build: Fix filter for building msi during release (#17236) 2019-05-23 11:56:34 +02:00
Ryan McKinley
9e7fa74682 DataSourcePlugin: Avoid anuglar injector if only one parameter (#17239) 2019-05-23 11:56:00 +02:00
Abhilash Gnan
ca6151e23f Alerting: Support for configuring content field for Discord alert notifier (#17017) 2019-05-23 08:31:02 +02:00