Commit Graph

98 Commits

Author SHA1 Message Date
Alcides Viamontes E
cff2be0d66 elasticsearch: add 7.x version support (#16646)
Adds a new version option 7.0+ (70 internally).
Version 7.0+ doesn't include document types in index mappings 
so support for handling this have been added.
Version 7.0+ returns number of hits in a different way so 
support for handling this have been added.
Version 7.0+ doesn't support sending 
max_concurrent_shard_requests in multisearch header so 
support for sending this in query string have been added.
Update elastic6 docker block and dashboards (devenv) to use 
6.7.1 images, filebeat index name is now filebeat-YYYY.MM.DD 
and dashboard include correct tags and links.
Add elastic7 docker block and provisioning (devenv).
Updates documentation regarding new version.

Closes #15622
2019-04-25 09:41:13 +02:00
Josh
fca5ee4bea Provisioning: Support FolderUid in Dashboard Provisioning Config (#16559)
* add folderUid to DashbaordsAsConfig structs and DashbardProviderConfigs struct, set these values in mapping func
look for new folderUid values in config_reader tests
set dashboard folder Uid explicitly in file_reader, which has no affect when not given

* formatting and docstrings

* add folderUid to DashbaordsAsConfig structs and DashbardProviderConfigs struct, set these values in mapping func
look for new folderUid values in config_reader tests
set dashboard folder Uid explicitly in file_reader, which has no affect when not given

* formatting and docstrings

* add folderUid option, as well as documentation for the rest of the fields

* add blank folderUid in devenv example.

* add folderUid to provisioning sample yaml

* instead of just warning, return error if unmarshalling dashboard provisioning file fails

* Removing the error handling and adding comment

* Add duplicity check for folder Uids


Co-authored-by: swtch1 <joshua.thornton@protonmail.com>
2019-04-24 08:57:42 +02:00
Andrej Ocenas
66f6e16916
Security: Store datasource passwords encrypted in secureJsonData (#16175)
* Store passwords in secureJsonData

* Revert unnecessary refactors

* Fix for nil jsonSecureData value

* Remove copied encryption code from migration

* Fix wrong field reference

* Remove migration and provisioning changes

* Use password getters in datasource proxy

* Refactor password handling in datasource configs

* Add provisioning warnings

* Update documentation

* Remove migration command, moved to separate PR

* Remove unused code

* Set the upgrade version

* Remove unused code

* Remove double reference
2019-04-15 11:11:17 +02:00
Torkel Ödegaard
844ec82eb0 More development dashboards (#16550)
* Dev: more dev dashboards and structure

* Moving gdev dashboards around into folders and aligning tags
2019-04-15 10:51:17 +02:00
Ryan McKinley
4a4ee57fab Elasticsearch: Format elasticsearch test dashboard json (#16537) 2019-04-12 09:19:53 +02:00
Marcus Efraimsson
276755a0e4
devenv: add elasticsearch v6 filebeat integration (#16493)
Adds filebeat (log collector) to elasticsearch v6 docker block that 
collects Grafana logs.
Also adds a new elasticsearch v6 datasource and test dashboard 
thru provisioning.
2019-04-11 10:53:23 +02:00
Marcus Efraimsson
aaaa39a48e devenv: add worldmap panel panels for elasticsearch (#16313) 2019-04-11 09:58:42 +02:00
Oleg Gaidarenko
67cbc7d4cf
Chore: use remote cache instead of session storage (#16114)
Replaces session storage in auth_proxy middleware with remote cache

Fixes #15161
2019-04-08 14:31:46 +03:00
Andrej Ocenas
516b7ce845
docs(dev): Update docs about devenv dir (#16208)
* Update readmes

* Fix devenv dasboard query

* Update devenv readme

* Add link to devenv from docs
2019-03-25 21:14:24 +01:00
Marcus Efraimsson
6c9b9b360a
fix(dashboard): time regions spanning across midnight (#16201)
Fixes #14590
2019-03-25 23:51:10 +07:00
Carl Bergquist
291ffcb75b
Merge pull request #15457 from bergquist/distributed_cache
Distributed cache
2019-03-14 16:16:39 +01:00
Torkel Ödegaard
71159fb606 Merge remote-tracking branch 'origin/master' into bar-gauge-poc 2019-03-13 08:26:06 +01:00
bergquist
3890bd14eb fixes typo in redis devenv 2019-03-08 09:09:28 +01:00
Daniel Lee
b582611004 docker: update prometheus2 block to version 2.7.2 2019-03-05 20:24:31 +01:00
Leonard Gram
818ccb572e devenv: fixes incorrect influxdb config.
[skip ci]
2019-03-04 11:23:33 +01:00
Peter Holmberg
0de9c03879 Merge branch 'gauge-multi-series' into bar-gauge-poc 2019-02-19 15:53:05 +01:00
Marcus Efraimsson
0cbf7aaf25
Merge pull request #15412 from marefr/ha_loki
devenv: loki support in ha test
2019-02-14 10:15:51 +01:00
Torkel Ödegaard
0ed32ebcb4 Changed devenv default data source to testdata 2019-02-13 14:09:04 +01:00
Marcus Efraimsson
0f758fd1ff
devenv: use grafana:dev image in ha test per default 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
e61616d829
devenv: send nginx logs to loki in ha test 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
d55a6deb97
devenv: proper fluentd conf for grafana and loki 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
7b1249ad47
devenv: use grafana/fluent-plugin-loki 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
0f40b2d206
devenv: trying to make fluentd with inoffical fluent-plugin-loki work 2019-02-13 11:18:29 +01:00
Torkel Ödegaard
edd9576f15 Fixed elastic5 docker compose block 2019-02-12 08:04:30 +01:00
Peter Holmberg
c7bb563cef devenv test dashboard 2019-02-11 13:43:58 +01:00
Daniel Lee
13d9acb1ef ldap: adds docker block for freeipa 2019-02-08 08:18:24 +01:00
Marcus Efraimsson
3555997f98
devenv: update ha test and load test
better ha setup for many mysql connections
prometheus now scrapes mysql metrics in ha setup
ha setup provisions mysql dashboard
adds configurable virtual users for load test run script
2019-02-06 22:33:48 +01:00
Marcus Efraimsson
fdd5ac1895
devenv: switching back using loki master plus various fixes 2019-02-04 09:55:23 +01:00
Marcus Efraimsson
0442a86400
tailing grafana logs and temporaily using an older build 2019-01-31 19:22:25 +01:00
Marcus Efraimsson
60967de2b4
devenv: loki provisioned datasource 2019-01-29 13:03:49 +01:00
Daniel Lee
62a04d8ef5 docker: block for loki 2019-01-29 12:14: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
Marcus Efraimsson
cfd8bd711b
org id fix for load test 2019-01-24 23:49:45 +01:00
Marcus Efraimsson
6454de74e4
user auth token load tests using k6.io 2019-01-24 22:47:53 +01:00
Torkel Ödegaard
3a827fc2f1 Added test case dashboard 2019-01-18 13:12:32 +01:00
Carl Bergquist
1a7eb2f462
Merge pull request #14868 from bergquist/provisioning_inifinite_loop
Avoid infinite loop in the dashboard provisioner
2019-01-15 10:34:18 +01:00
bergquist
8880829eda avoid infinite loop in the dashboard provisioner
if one dashboard with an uid is refered to by two
provsioners each provsioner overwrite each other.
filling up dashboard_versions quite fast if using
default settings.

ref #12864
2019-01-14 16:38:39 +01:00
Marcus Efraimsson
130e4aa666
Merge pull request #14608 from marefr/es_bucket_script
Fix support bucket script pipeline aggregations
2019-01-14 15:58:42 +01:00
Daniel Lee
96759e39a6 docker: enable flux in influxdb docker block 2019-01-10 09:47:39 +01:00
bergquist
24636da800 closes the body properly on successful webhooks
this commit also adds a test docker container
for receiving alerting web hook requests
2018-12-27 16:08:13 +01:00
Marcus Efraimsson
b45f72a140
elasticsearch: support bucket script pipeline aggregations 2018-12-20 01:24:36 +01:00
Marcus Efraimsson
c46d01dc83
Merge pull request #14090 from marefr/8843_pipeline_doc_count
Fix pipeline aggregations on doc count
2018-12-12 13:21:13 +01:00
Erik Sundell
49e756aa93 use links instead of bridge network 2018-12-10 14:25:29 +01:00
bergquist
4bd8b2c130 gfdev: fixes unparseable for duration 2018-11-21 11:41:54 +01:00
bergquist
afbc16c499 gfdev: adds alert always in pending state 2018-11-21 11:34:21 +01:00
Carl Bergquist
6049855dc7
Merge pull request #13947 from bergquist/alerting_for
Introduce alert debouncing
2018-11-19 10:38:02 +01:00
Marcus Efraimsson
18810ca77f
devenv: elasticsearch datasources and dashboards 2018-11-15 19:07:38 +01:00
Marcus Efraimsson
0810aa2e60
Merge pull request #12371 from marefr/xaxis_thresholds
Time regions support in graph panel
2018-11-15 08:46:39 -08:00