Commit Graph

60 Commits

Author SHA1 Message Date
Josh Soref ed92b41d47 Chore: spelling - misc (#24438)
* Chore: spelling - misc

* fix master merge
2020-06-04 06:51:30 +02:00
Ivana Huckova 4d18bda2e1 Prometheus: Fix recording rules expansion (#24977)
* First pass solution

* Refactor solution

* Add test coverage, update tests

* Fix behaviour for multiple labels, add test for this

* Add recordin rules to devenv prometheus

* Update devenv/prometheus2 instead of devenv/prometheus

* Add newlines

* Fix label matching if labels include comma, add test coverage

* Refactor

* Refactor, simplify
2020-05-22 15:16:01 +02:00
Andrej Ocenas d66d9aa62a Devenv: Add loki self logging to Jaeger block (#23646) 2020-05-05 09:51:21 +02:00
Leonard Gram 4645167421 Devenv: add remote renderer to grafana (#24050) 2020-04-29 15:16:37 +02:00
Andrej Ocenas 58b566a252 Tracing: Zipkin datasource (#23829) 2020-04-24 17:02:25 +02:00
Leonard Gram c081513a96 Devenv: fix prometheus scrape ips (#23850)
* Devenv: fix prometheus scrape ips

* Devenv: fix grafana in devenv reference

* Devenv: fixes prom random data reference
2020-04-24 13:23:49 +02:00
Arve Knudsen 7799dd84c1 Chore: Upgrade to Go 1.14 (#23371)
* Chore: Upgrade to Go 1.14
* Chore: Bump version of grafana/grafana-ci-deploy Docker image
* Chore: Fix/bump version of grafana/build-container Docker image
* CircleCI: Upgrade build Docker images
2020-04-08 14:13:05 +02:00
Leonard Gram a49d619874 Devenv: prom 1.7.6 (#23321) 2020-04-03 16:12:03 +02:00
Leonard Gram 229f135e5c Devenv: adds grafana block with a customizeable version (#22867)
The grafana block is pre-configured with the devenv datasources and
dashboards and will work with any other blocks out of the box.
2020-03-18 15:42:41 +01:00
Marcus Andersson f46ee12364 Build: Added devenv docker block for testing grafana with traefik. 2020-01-27 11:29:04 +01:00
David 36ff6d8635 Devenv: Fix loki block (#20967) 2019-12-09 15:29:47 +01:00
Lukas Siatka 0a080beffa DevEnv: updates nodejs from 10.x to 12.x and golang to 1.13 in ci-deploy dockerfile. (#20405)
* DevEnv: updates nodejs to 12.x and golang to 1.13

* Updates CI-build and CI-deploy image versions

* DevEnv: updates update repo readme

* DevEnv: updates build container version
2019-11-21 15:16:32 +01:00
Sofia Papagiannaki 85b7ddefc0 Devenv: Fix integration of postgres and fake-data-gen containers (#20329)
* Fix integration of postgres and fake-data-gen containers

This fix introduces the following modifications:
- Upgrades to 2.1 docker-compose file format
- Adds a health check for determining that postgrestest service is healthy
- Modifies the fake-postgres-data service to wait for postgrestest to be
"healthy" before starting.
- Renames postgrestest to postgres
2019-11-18 10:48:21 +02:00
Sofia Papagiannaki d46690ddc9 Devenv: Replace deprecated SQL Server docker image (#20352) 2019-11-13 16:36:52 +02:00
David 6d70545c07 Devenv: Enable tracing for loki docker block (#20309) 2019-11-12 13:26:35 +01:00
David 9f81fcdd2f Devenv: fix kibana in elastic7 docker block (#20308)
* Devenv: fix kibana in elastic7 docker block

* Remove network host mode for metricbeat container
2019-11-12 09:45:12 +01:00
Arve Knudsen ceb7f51b40 Devenv: Add nginx_proxy_mac/nginx_login_only.conf (#20310)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2019-11-11 20:05:16 +01:00
David fa91462d53 Devenv: fix connection in elastic 5 and 6 blocks (#20304)
* Docker block: fix failed connection in elastic5 block

* Fix docker block elastic6 data link

* Fix elastic7 datagenerator
2019-11-11 17:06:03 +01:00
David c941718a5f Docker blocks: Add loki blocks for loki releases (#20172)
* Docker blocks: Add loki blocks for loki releases

- Loki did major API changes between 0.3 and 0.4
- Adding blocks to simplify Grafana datasource testing for different
versions
- keeing `loki` block pointing at loki master
- Run all versions in parallel:
```
./create_docker_compose.sh loki0.3 loki0.4 loki
```
- all versions have different hostnames and ports internally
- datasource url depends on version so you can set them up as separate
datasources:
  - master: http://localhost:3100/
  - 0.3.0: http://localhost:3103/
  - 0.4.0: http://localhost:3104/

* Add loki minor version datasources
2019-11-11 16:31:45 +01:00
Torkel Ödegaard be2bf1a297 AuthProxy: Can now login with auth proxy and get a login token (#20175)
* AuthProxy: Can now login with auth proxy and get a login token

* added unit tests

* renamed setting and updated docs

* AuthProxy: minor tweak

* Fixed tests and namings

* spellfix

* fix

* remove unused setting, probably from merge conflict

* fix
2019-11-07 17:48:56 +01:00
Lukas Siatka 0a7fcb1a37 DevEnv: updates prometheus random data golang image to 1.13.0 2019-11-07 10:51:18 +01:00
Sofia Papagiannaki 55248f9269 Add devenv block for apache proxy working for Mac (#20119) 2019-10-31 15:57:58 +02:00
Ivana Huckova 32417e1388 Devenv: create slow_proxy_mac (#19174) 2019-09-17 15:25:48 +02:00
Oleg Gaidarenko 1e5fc76601 LDAP: improve POSIX support (#18235)
* LDAP: improve POSIX support

* Correctly abtain DN attributes result

* Allow more flexibility with comparison mapping between POSIX group & user

* Add devenv for POSIX LDAP server

* Correct the docs

Fixes #18140
2019-07-24 12:49:18 +03:00
Oleg Gaidarenko b049b003f2 Build: allow dynamically change docker image (#18112)
* Build: allow dynamically change docker image

Right now, only for couple DBs.
With the 2.1, you can do `${TAG:-5.6}` without needing the `.env` file, but
it seems it would be better for back-compat to support `.env` right now.

Fixes #17891

* Build: add prefix for removal process

* Docs: mention makefile command instead of the bash

Since we are moving to makefile for things and make command
simplifies some of the actions you have to perform to work with
different environments

* Docs: mention dynamic tags in the docs

* Docs: avoid name collision

Fixes #16107
2019-07-16 08:16:10 +02:00
Andrej Ocenas 743f8420bc devenv: Fix typo in nginix docker for mac (#18068) 2019-07-11 18:13:01 +02:00
Kyle Brandt c9f4cf8b53 devenv: switch OpenTSDB docker block (#17849)
old docker image, https://hub.docker.com/r/opower/opentsdb/,  seems to be gone
2019-07-01 09:11:25 -04:00
Oleg Gaidarenko ca136c7c22 Devenv:LDAP: couple simplifications for LDAP (#17807)
* Add LDAP config instead sed use

* Add container name

* Add SizeLimit option to client and to server.
  Probably useless at this point, but it's better to have it then otherwise
2019-07-01 15:09:04 +03:00
Leonard Gram 8493965d31 Devenv: makes the grafana users default for saml. (#17782) 2019-06-26 16:10:45 +01:00
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
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
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 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
Daniel Lee 96759e39a6 docker: enable flux in influxdb docker block 2019-01-10 09:47:39 +01:00