root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 150 Packages Projects Releases Wiki Activity
62,790 Commits 1,485 Branches 636 Tags 2.5 GiB
Commit Graph

348 Commits

Author SHA1 Message Date
Oleg Gaidarenko e83953f24e Devenv:SAML: devenv block with saml test app (#17733) 
* Devenv:SAML: devenv block with saml test app

Includes documentation, couple custom users and
actual docker-compose of course :)

Ref: #4780
 2019-06-25 13:31:27 +02:00
Andrej Ocenas 97f7c92455
Devenv: Add nginx proxy for mac (#17572) 2019-06-13 21:29:33 +02:00
Marcus Efraimsson f41a6c8962
Devenv: Add telegraf with log parsing to influxdb docker block (#17546) 2019-06-12 15:30: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
Marcus Efraimsson 1a2841e244
devenv: metricbeat and kibana for elasticsearch 7 block (#17262) 2019-05-27 09:55:58 +02:00
Marcus Efraimsson bc3a718107
devenv: adds auth proxy load test (#17271) 2019-05-24 17:51:10 +02:00
Oleg Gaidarenko db95414d02
Feature: provide multildap server configuration (#16914) 
* Feature: provide multildap server configuration

* Add multildap server configuration for devenv

* Change some of the notes for openldap devenv configuration

* Change the maintainer label for *main* dockerfile and of the devenv one

Re-checked the multildap logic - everything seems to be working fine
 2019-05-13 11:51:16 +03:00
Andrej Ocenas 2abb009d68
Chore: Add prometheus basic auth proxy (#16882) 2019-05-09 12:08:27 +02:00
Carl Bergquist b426ff5292
devenv: add slow reverse proxy (#16943) 
this can be useful when testing timeouts etc
in the dataproxy

ref #16923
 2019-05-08 10:09:48 +02:00
Oleg Gaidarenko 78cd9058a3
Feature: add cron setting for the ldap settings (#16673) 
* Feature: add cron setting for the ldap settings

* Move ldap configuration read to special function

* Introduce cron setting (no docs for it yet, pending approval)

* Chore: address code review comments
 2019-04-25 17:12:56 +03:00
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
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
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
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
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
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
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
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 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
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
bergquist 5954ab2c0d adds redis devenv block 2018-11-13 10:27:57 +01:00
bergquist 0ddfd92f8c adds debounce duration for alert dashboards in ha_test 2018-11-07 22:30:23 +01:00
Marcus Efraimsson bcdda7b9ad
devenv: fix influxdb block 2018-10-11 17:17:10 +02:00
Marcus Efraimsson 35eddee2dd
devenv: add postgres ha test config example 2018-10-01 19:40:03 +02:00
Marcus Efraimsson d313ffa847
devenv: enable some debug logging for ha test setup 2018-09-28 18:35:43 +02:00
Marcus Efraimsson f6b8d3a1c2
devenv: grafana high availability (ha) test setup 2018-09-27 09:24:40 +02:00
Axel Pirek d2f2c3f220 Fix spelling of your and you're 2018-09-25 12:38:02 +02:00
Marcus Efraimsson 667ca3d54d
devenv: fix docker blocks paths 2018-09-19 17:59:55 +02:00
Marcus Efraimsson 978284bc3d
devenv: re-add missing docker-compose files 2018-09-19 14:35:27 +02:00
bergquist c1f797ed90 moves docker/ to devenv/docker 2018-09-17 11:10:03 +02:00