Commit Graph

87 Commits

Author SHA1 Message Date
Torkel Ödegaard
e499585271
Devenv: Fix prometheus config so that it scrapes your dev instance like before (#32583)
* Devenv: Fix prometheus config so that it scrapes your dev instance like before

* prom1
2021-04-01 09:26:16 +02:00
Piotr Jamróz
3fcff2555a
Devenv: Graphite docker blocks fixes (#32352)
* Fix running graphite data sources in dev env

* Remove broken dashboard files

* Add Graphite 1.0 and 0.9 to provisioned data sources
2021-03-30 09:25:27 +02:00
Giordano Ricci
f7d079c0a5
Chore: Remove elasticsearch 1.x from devenv (#32283) 2021-03-24 14:57:32 +00:00
Marcus Efraimsson
c0edf88f9f
Data proxy: Fix encoded characters in URL path should be proxied encoded (#30597)
Fix encoded characters in URL path should be proxied as encoded in the data proxy.

Fixes #26870 
Fixes #31438

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-03-17 12:17:41 +01:00
Gábor Farkas
5e38d4538d
devenv: add influxQL-compatible influxDB2 data-source (#31818)
* datasource: add influxQL-compatible influxDB2 data-source

* improved wording

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
2021-03-09 16:56:42 +01:00
Andrej Ocenas
f029e84565
Devenv: Add tempo data source (#31138)
* Add tempo DS to devenv

* Remove unsupported values from config

* Add tempo ds

* Remove tempo-query
2021-03-08 16:04:42 +01:00
Ivana Huckova
6d1076fca7
Devenv: Add gdev-influxdb2 data source (#31250)
* Add gdev-influxdb2 data source

* Change influxdb2 docker block to use 8087 port

* Update telegraf url
2021-02-23 16:30:35 +01:00
Ivana Huckova
58968e1ceb
Devenv: Remove old-versioned loki blocks and update prometheus2 block (#31282)
* Remove very old-versioned loki blocks

* Update prometheus block from 2.7.2 to latest

* Remove data sources in Grafana

* Fix e2e test not to intercept the whole url

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
2021-02-19 18:06:09 +01:00
Zoltán Bedi
114c426f34
Zipkin: Show success on test data source (#30829)
* Zipkin: Show success on test data source

Add zipkin example app to devenv
Migrate to fetch api in data source

* Add back return types for functions
2021-02-19 15:38:16 +01:00
Ivana Huckova
c269f18500
Remove deprecated and breaking loki config field (#31227) 2021-02-16 13:11:18 +01:00
Andrej Ocenas
7db00ed6a0
InfluxDB: Add http configuration when selecting InfluxDB v2 flavor (#30827)
* Add dev env block for influx2

* Add http settings to influx config

* Update devenv/docker/blocks/influxdb2/docker-compose.yaml

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
2021-02-03 15:16:59 +01:00
Tania B
2efcd11c12
Devenv: Add default db for influxdb (#29371) 2020-12-03 11:50:35 +02:00
Sofia Papagiannaki
6c4f6211cb
Devenv: update mysql_tests and postgres_tests blocks for allowing dynamically change of underlying docker image (#29525)
* Devenv: allow dynamically change mysql_tests docker image

* Devenv: allow dynamically change postgres_tests docker image
2020-12-02 11:06:53 +02:00
Todd Campbell
643f790753
Alerting: Add support for Sensu Go notification channel (#28012)
* Add support for Sensu Go notification channel

Similar to current support for the older "Core" version of
Sensu, this commit add support for the newer version.

Closes #19908

Signed-off-by: Todd Campbell <todd@sensu.io>

* fix linter errors

Signed-off-by: Todd Campbell <todd@sensu.io>

* Apply suggestions from code review

PR review suggestions

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix no new variables error

* Replace convey testing with testify

Signed-off-by: Todd Campbell <todd@sensu.io>

* Wording suggestions

Signed-off-by: Todd Campbell <todd@sensu.io>

* Add docker compose environment for testing/maintenance

Signed-off-by: Todd Campbell <todd@sensu.io>

* Renamed and fixed docker-compose.yaml to work in devenv

Signed-off-by: Todd Campbell <todd@sensu.io>

* Change sensugo web UI port to 3080 so as not to conflict with grafana

Signed-off-by: Todd Campbell <todd@sensu.io>

* Apply suggestions from code review

Set the API key as a secure value.

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

* Add Sensu Go information to notifications doc

Signed-off-by: Todd Campbell <todd@sensu.io>

* Update pkg/services/alerting/notifiers/sensugo.go

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

* change assert to require for Error/NoError tests

Signed-off-by: Todd Campbell <todd@sensu.io>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
2020-11-27 19:09:24 +02:00
Jaana Dogan
96eefee402
Fix gosec finding of unhandled errors (#29398)
Not critical but fixing it to avoid gosec reporting G104.
2020-11-26 08:05:36 +01:00
Marcus Andersson
563fe01fc0
Devenv: adding default credentials for influxdb (#29344) 2020-11-25 08:28:03 +01:00
Arve Knudsen
3e60b41883
Devenv: Fix Prometheus basic auth proxy (#28889)
* prometheus basic auth proxy: Pin base image version

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* prometheus basic auth proxy: Don't use host network mode

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* prometheus basic auth proxy: Enable logging

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* prometheus basic auth proxy: Fix Dockerfile location

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-11-06 14:56:02 +01:00
Arve Knudsen
45f311874d
devenv: Upgrade MSSQL Docker image (#28749)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-11-03 09:45:21 +01:00
Arve Knudsen
9742f63a11
Chore: Pin nginx base image in nginx proxy Dockerfiles (#28730)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-11-02 10:21:14 +01:00
garanews
61749dee23
Fix typos (#28074)
Parsed all repo with a regexp of common misspelled words and fixed.
2020-10-07 11:29:30 +01:00
Ryan McKinley
726bb4477b
Live: cleanup and simple changes (#28028) 2020-10-04 23:53:52 -07:00
John S
4d3067e139
Docs: Refactor inconsistent unordered lists (#27826)
* Docs: Refactor inconsistent unordered lists

* add requested changes

* Update docs/sources/linking/data-link-variables.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/http_api/_index.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/guides/whats-new-in-v6-0.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/auth/auth-proxy.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* resolve weird line breaks

* revert unintentional change

* Update docs/sources/auth/auth-proxy.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/auth/auth-proxy.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/auth/auth-proxy.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
2020-10-02 11:02:11 -07:00
Jorge Vallecillo
9e3def4214
Fix typos (#27711) 2020-09-22 11:00:59 -07:00
Pratik Raj
cfc618ef44
Use git clone --depth (#26976)
Signed-off-by: Pratik Raj <rajpratik71@gmail.com>
2020-09-08 09:27:10 +02:00
Arve Knudsen
19c8097595
Chore: Upgrade to Go 1.15.1 (#27326)
* Chore: Upgrade to Go 1.15.1
2020-09-02 15:51:19 +02:00
Arve Knudsen
0e1e85656b
InfluxDB: Upgrade InfluxDB in devenv (#26983)
* InfluxDB: Upgrade InfluxDB in devenv
* InfluxDB: De-export symbols
* InfluxDB: Remove unused code
* devenv: Make InfluxDB version configurable

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-08-19 09:23:11 +02:00
Pratik Raj
3bed3248d9
Use --no-cache-dir flag to pip in Dockerfiles, to save space (#26978)
Use `--no-cache-dir` flag to `pip` in Dockerfiles, to save space

Signed-off-by: Pratik Raj <rajpratik71@gmail.com>
2020-08-13 10:04:31 +02:00
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