Commit Graph

292 Commits

Author SHA1 Message Date
Marcus Efraimsson
919a26f389
Instrumentation: Guidance/conventions for logs, metrics and traces (#55562)
A first rough draft of adding some guidance/conventions for instrumenting 
Grafana with logs, metrics and traces together with how to run things 
locally to query/visualize logs, metrics and traces.

Closes #55470

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
Co-authored-by: Kristin Laemmert <mildwonkey@users.noreply.github.com>
Co-authored-by: Carl Bergquist <carl.bergquist@gmail.com>
2022-09-22 11:39:14 +02:00
Gábor Farkas
3a545007ca
elastic: devenv: add nested objects to data generator (#55482) 2022-09-21 11:34:49 +02:00
Gábor Farkas
323ca6825a
devenv: removed obsolete elastic docker configs (#55402) 2022-09-20 10:16:28 +02:00
Torkel Ödegaard
cc4392d514
Devenv: Add compose block for elastic 8 (#55214)
* Devenv: Add compose block for elastic 8

* added filebeat and metricbeat configurations

* disable mount to `/var/log`

* renamed to elasticstack

Co-authored-by: Sven Grossmann <svennergr@gmail.com>
Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
2022-09-19 16:05:42 +02:00
Sven Grossmann
aabd626403
Devenv: Fix filebeat level labels (#55217) 2022-09-15 10:33:39 +02:00
Gábor Farkas
5388dc6a2f
devenv: elastic: new version (#54841) 2022-09-12 11:48:39 +02:00
Jo
ef245874da
OAuth: Allow assigning Server Admin (#54780)
* extract errors to errors file

* implement oauth server admin assignment

* add server admin tests

* deduplicate autoAssignOrgRole

* deduplicate strict setting

* deduplicate strict setting

* add support for generic oauth

* add role attribute strict support for generic oauth

* add support for github/gitlab

* assignGrafanaAdmin option is here to stay

* unify similar errors

* add config option

* add okta server admin mapping

* remove never used Company attribute

* unify generic oauth role extract with other methods

* case insensitive role match as in azure

* add ini settings

* add server admin to devenv

* remove duplicate fields

* add documentation to oauth

* fix titlecase test

* implement doc feedback
2022-09-08 06:11:00 -04:00
Joe Blubaugh
a101d127cb
CI: Update Drone MySQL version to 5.7.39 to match database policy. (#54612)
The supported database policy is listed at: https://grafana.com/docs/grafana/latest/setup-grafana/installation/#supported-databases
2022-09-08 15:03:02 +08:00
Nicholas Wiersma
9e704fec3c
JWT: Add support for assigning org roles (#54277)
* feat: allow jwt role to be set

* chore: update documentation

* fix: cr suggestions

* fix: lint issues

* respect org auto assign and default org ID

* add server admin to devenv

Co-authored-by: jguer <joao.guerreiro@grafana.com>
2022-09-07 14:00:33 +02:00
linoman
0324e9c60e
Fix paths for auth/ build and volume paths (#54828) 2022-09-07 10:53:58 +02:00
linoman
c915cb2d5c
Update auth/jwt_proxy and auth/oauth reference (#54781) 2022-09-06 15:46:01 +02:00
linoman
638fb5dc6d
Fix docker compose for openldap and oauth (#54745)
* Fix reference for `openldap` block

* Fix volume reference for `oauth` block
2022-09-06 14:22:03 +02:00
Jo
4952b7f22d
Add JWT url auth documentation (#54040)
* add jwt auth docs

* add appropriate warnings to docs

* remove unimplemented login_token assumptions

* Update conf/sample.ini
2022-09-05 03:46:50 -04:00
Joe Blubaugh
56369457d4
Grafana Backend: Establish a database version support policy. (#54374)
As stated in the documentation, Grafana will support the versions of our backend database options that are supported by their projects at the time that a Grafana release is issued.
2022-08-31 09:40:35 +08:00
linoman
3f0beee362
Update README build references (#54394) 2022-08-29 16:36:06 +02:00
Marcus Efraimsson
9ff2b33ff1
Chore: Fix prometheus docker block (#54388) 2022-08-29 08:42:46 -04:00
linoman
d2547bb832
Chore: Group auth docker blocks (#54274)
* Move auth docker images to parent folder

* Add README file for auth parent folder

* Add grafana-authnz-team as code owner

* Update `devenv` docs
2022-08-29 08:36:56 +02:00
Marcus Efraimsson
cd5f27a25d
Plugins: Propagate distributed tracing headers to backend plugins (#54107) 2022-08-24 11:55:49 +02:00
linoman
52904151f1
Update open ldap for macos (#53819)
* Add new OpenLDAP Docker block for macOS

* Add preconfigured users, groups and modules

* Add README
2022-08-18 12:31:19 +02:00
Gábor Farkas
6fe2d4724a
devenv: elastic: update to new version (#53825) 2022-08-17 15:02:00 +02:00
Jo
062d255124
Handle ioutil deprecations (#53526)
* replace ioutil.ReadFile -> os.ReadFile

* replace ioutil.ReadAll -> io.ReadAll

* replace ioutil.TempFile -> os.CreateTemp

* replace ioutil.NopCloser -> io.NopCloser

* replace ioutil.WriteFile -> os.WriteFile

* replace ioutil.TempDir -> os.MkdirTemp

* replace ioutil.Discard -> io.Discard
2022-08-10 15:37:51 +02:00
linoman
9f749eead7
Fix cloak typo (#53474) 2022-08-09 17:38:49 +02:00
Mihály Gyöngyösi
3ac4415d6d
Devenv: Universal jwt_proxy environment (#53377)
* change hostname to env.grafana.local to not collide with any custom host.docker.internal settings
* add WSL2 documentation
* update general documentation
* cleanup
2022-08-09 17:02:36 +02:00
linoman
ed5dac7a75
Fix groups and useres indentation (#53414) 2022-08-09 08:05:15 +02:00
Joey Tawadrous
1592ea45b0
Tempo: Devenv update to support all features (#52728)
* Tempo devenv

* Add logging to tempo devenv

* Update readme

* Formatting

* Update loki image

* Update tempo image
2022-08-03 11:24:50 +01:00
Jo
c2d3c90bc8
Auth: Implement Token URL JWT Auth (#52662)
* Auth: check of auth_token in url and resolve user if present

* check if auth_token is passed in url

* Auth: Pass auth_token for request if present in path

* no need to decode token in index

* temp

* use loadURLToken and set authorization header

* cache token in memory and strip it from url

* Use loadURLToken

* Keep token in url

* strip sensitive query strings from url used by context logger

* adapt login by url to jwt token

* add jwt iframe devenv

* add jwt iframe devenv instructions

* add access note

* add test for cleaning request

* ensure jwt token is not carried into handlers

* do not reshuffle queries, might be important

* add correct db dump location

* prefer set token instead of cached token

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2022-07-27 16:10:47 +02:00
Kristina
0e13ee345d
Explore: Change datasourceName usage to datasourceUID or datasourceRef where appropriate (#52479)
* First pass at using datasource UID when appropriate

* Fix tests

* be more lenient with lookup to accomodate different URLs

* Make test setup get mock work like real datasource get

* Fix the typing issue and remaining tests

* Fix PR feedback
2022-07-25 13:05:57 -05:00
Jguer
b79b53cbdb
JWT: Add JWT proxy setup devenv (#51731)
* JWT: Add JWT Auth devenv

* Auth: JWT allow retrieving login token

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* JWT: Add JWT Auth Proxy devenv

* JWT: Add instructions to readme

* JWT: Add JWT users

* JWT: Remove oauth users

* revert session changes, unnecessary

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
2022-07-07 10:28:04 -04:00
Gábor Farkas
df9f86190f
devenv: influxdb: fix config (#51781) 2022-07-06 11:58:17 +02:00
Gabriel MABILLE
c9708e1813
Devenv: Add an oauth block (#51514)
* Devenv: Add an oauth block

* Adding profile to responses

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

Co-authored-by: Jguer <joao.guerreiro@grafana.com>
2022-07-04 13:56:15 +02:00
Gabriel MABILLE
849d4a3c56
Fix postgres devenv (#49487) 2022-06-28 09:12:25 +02:00
Gábor Farkas
113e601dcf
devenv: elastic: fixed docker-compose syntax (#49517) 2022-06-07 11:04:27 +02:00
Gábor Farkas
6011c373ae
loki: handle ad hoc filters in backend mode (#50135)
* loki: handle ad hoc filters in backend mode

* devenv: better loki fake data

* added test
2022-06-03 10:53:03 +02:00
Gábor Farkas
52c775368b
devenv: loki: better fake logs (#50024)
* devenv: loki: more log-levels

* devenv: loki: logfmt mode
2022-06-02 10:23:26 +02:00
Will Browne
abfc711c53
Plugins: Remove deprecated /api/tsdb/query metrics endpoint (#49916)
* remove /api/tsdb/query

* revert changes to alert rules

* regenerate spec based on 9.0.x
2022-06-01 13:05:15 +02:00
Gábor Farkas
ebc20849bd
devenv: better loki environment (#49383)
* devenv: rename loki to loki-promtail

* devenv: new loki devenv entry with fake data generation
2022-05-25 11:01:17 +02:00
Gabriel MABILLE
41c99e4487
Devenv: Fix fake data gen to target mysql server (#49472) 2022-05-24 14:11:39 +02:00
Gábor Farkas
a3c5834594
Elastic: devenv: improved devenv-image (#49002)
* devenv: elastic: improved config

* better ascii-codes
2022-05-19 08:29:23 +02:00
Gábor Farkas
d73bd617f0
devenv: elastic: removed unsupported versions, first step (#48960) 2022-05-16 06:34:38 +00:00
Sofia Papagiannaki
f263cad8ab
Devenv: fix alert_webhook_listener (#44820) 2022-04-15 13:32:20 +02:00
Marcus Efraimsson
9eb2cd537d
Plugins: Make backend plugin metrics endpoints available with optional authentication (#46467)
* add new endpoint without auth+config

* add cfg check

* fit lint issue

* Add basic auth support

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>

* WIP docs

* Update docs/sources/administration/view-server/internal-metrics.md

Co-authored-by: Dave Henderson <dhenderson@gmail.com>

* update instructions

Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
Co-authored-by: Dave Henderson <dhenderson@gmail.com>
2022-03-29 11:18:26 +02:00
Todd Treece
cf9f76319a
DevEnv: Enable remote write for prometheus (#46256) 2022-03-14 09:18:33 -04:00
Gábor Farkas
f0f43e4635
loki:devenv: better config name (#45906) 2022-02-25 13:32:24 +01:00
Ivana Huckova
9e452c7166
Devenv: Update Elasticsearch v7 image so it is usable on ARM (M1) (#45612)
* Devenv: Update Elasticsearch v7 images so they are usable on ARM (M1)

* Remove changes in 77

* Update data sources
2022-02-24 16:48:18 +01:00
Will Browne
4e23b06b40
remove old fields and expose ports (#45626) 2022-02-21 16:52:38 +01:00
Gabriel MABILLE
7c41cd15d7
Chore: Remove devenv link (#45583) 2022-02-18 09:44:18 +01:00
Christopher Moyer
46360ca0c3
Docs: refactored manage users and permissions content (#44343)
* initial refactor

* initial draft for teams

* restructed topics, added front matter

* modified aliases

* removes old files

* removed files

* initial refactor

* initial draft for teams

* restructed topics, added front matter

* modified aliases

* removes old files

* removed files

* final xrefs updates

* xref adjustment

* copy updates

* copy and content updates to about, add to org, add user, admin

* copy updates to remove user from org

* update org vs server admin section names, cross-link

* cross-link add and invite users to org

* add remaining cross-links between org and server admin

* add dashboard permissions table

* add permissions information to teams

* add copy invite instructions to invite management

* tweaks and link updates

* incorporated PM feedback

* fixed xrefs

* yarn prettier

* fix codespell

* combined teams and dashboard permissions content

Co-authored-by: Mitchel Seaman <mitchel.seaman@gmail.com>
2022-02-15 13:20:45 -06:00
Sofia Papagiannaki
4ca8529b76
Devenv: fix permission failures for mysql_tests and postgres_tests docker blocks (#44203) 2022-01-28 11:39:28 +02:00
Morten Nygaard Åsnes
9e4aafa719
MSSQL: Configuration of certificate verification for TLS connection (#31865)
Fixes #24589

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2022-01-26 15:00:18 +01:00
Victor Marin
f8b527b818
Build: Add MSSQL devenv for ARM64 processors (#43888)
* Build: Add MSSQL devenv for ARM64 processors

* Change docker image tag from latest to fixed version
2022-01-12 16:24:06 +02:00
lean.dev
79bf0fc3d1
Fixing login request in loadtest (#43750) 2022-01-11 10:35:02 -03:00
Gilles De Mey
56d088c441
devenv: fix maildev block (#43624) 2022-01-03 22:15:24 +01:00
Daniel Lee
e993f0c62e
devenv: Solving two of the code scanning fails (#43084)
* Solving two of the code scanning fails

Removes new lines from user input that is logged. Fixes CWE-117 from CodeQL

* remove newlines from request headers

* mask cookie value in header

* comment out logging of headers to solve CWE-117

Instructions added on uncommenting the log statement and on rebuilding the docker container
2021-12-21 11:36:21 +01:00
Yuriy Tseretyan
cdfb2d02d5
add maildev to docker blocks (#42661) 2021-12-02 19:45:56 -05:00
Giordano Ricci
1b99d88337
Elasticsearch: Add support for Elasticsearch 8.0 (Beta) (#41729)
* use fixed_interval in date_histogram

* Add 8.0 to available versions in datasource settings

* Remove moving_avg from available metric aggregations

* Add ES8 devenv

* Update public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/utils.ts

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>

* Add FE tests

* Add BE test

* fix FE test

* fix BE test

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
2021-11-17 20:30:53 +01:00
Gábor Farkas
f6ad3e420a
devenv: influxdb: better config (#41456) 2021-11-11 14:20:57 +01:00
Zoltán Bedi
ea583e7d42
Devenv: Fix fake data gen docker to use same network (#41355)
* Dev: MSSql fake data gen docker to use same network

* Fix all datasources that used network_mode: bridge
2021-11-08 19:53:57 +01:00
Jesse Weaver
502169baa8
Fix K6 load test script (#38465)
K6 now requires that the path to the load test be prefixed with /.
2021-10-29 09:38:41 -06:00
gotjosh
7db97097c9
Alerting: Support Unified Alerting with Grafana HA (#37920)
* Alerting: Support Unified Alerting in Grafana's HA mode.
2021-09-16 15:33:51 +01:00
Kyle Brandt
f524cdb5ee
devenv: update prom random_data for go1.17 (use go install) (#38763)
* devenv: update prom random_data for go1.17 (use go install)
* restore env vars and tags to install cmd
2021-09-02 10:32:09 +02:00
Dimitris Sotirakis
8e2ee0a1c8
Chore: Update to Golang 1.17 (#38608)
* Update to golang 1.17

* Further updates

* Run go mod tidy on go 1.17

* Apply suggestions from code review

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Use build-container:1.4.2

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2021-08-31 09:19:26 +03:00
Gábor Farkas
9e8035ef30
devenv: influxdb: update telegraf config (#37835) 2021-08-23 09:38:47 +02:00
Gábor Farkas
28229fc344
devenv: influxdb: simplified versioning for old-version influxdb (#37726) 2021-08-12 08:36:50 +02:00
Ivana Huckova
4f340550ee
Change master to latest for docker block (#37310) 2021-07-29 10:10:45 +02:00
Gábor Farkas
367f3ea0ae
devenv: influxdb: updated telegraf to new version (#36795) 2021-07-16 08:44:54 +02:00
Serge Zaitsev
93cd375ada
remove GO111MODULE (#36235) 2021-06-29 10:01:21 +02:00
Ester Martí Vilaseca
81a79aef23
Elasticsearch: add rate aggregation (#33311)
* Elasticsearch: add first version of rate aggregation

* Add test for rate aggreation settings editor

* Fix unit

* Add default value for mode for rate agg

* Add todo

* Revert "Add default value for mode for rate agg"

This reverts commit a44c985d8b.

* Fix width when select is empty

* Add rate aggregation to elasticsearch models

* Remove rate aggregation from extended stats

* Move elastic2 docker block & add elastic (latest)

* Add versionRange to rate aggregation

* add 7.10 elasticsearch version option

* Set supportsInlineScript to true for rate aggregation

* Remove fixed width from select

* Change seconds label for rate aggregation unit options dropdown

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>

Co-authored-by: Elfo404 <me@giordanoricci.com>
Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
2021-06-28 11:55:31 +01:00
Gábor Farkas
31aaf94e91
devenv: updated influxdb1 version (#36031) 2021-06-23 08:35:13 +02:00
Chris Cowan
f580c9149c
Elasticsearch: Add Top Metrics Aggregation and X-Pack support (#33041)
* Elasticsearch: Add Top Metrics Aggregation

* Adding support for non-timeseries visualizations

* removing console.logs

* restoring loadOptions type

* Honor xpack setting

* Adding test for elastic_response

* adding test for query builder

* Adding support of alerting

* Fixing separator spelling

* Fixing linting issues

* attempting to reduce cyclomatic complexity

* Adding elastic77 Docker block

* Update public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.test.tsx

Co-authored-by: Giordano Ricci <grdnricci@gmail.com>

* refactoring MetricsEditor tests

* Fixing typo

* Change getFields type & move TopMetrics to a separate component

* Fix SegmentAsync styles in TopMetrics Settings

* Fix field types for TopMetrics

* WIP

* Refactoring client side to support multiple top metrics

* Adding tests and finishing go implimentation

* removing fmt lib from debugging

* fixing tests

* reducing the cyclomatic complexity

* Update public/app/plugins/datasource/elasticsearch/elastic_response.ts

Co-authored-by: Giordano Ricci <grdnricci@gmail.com>

* Update public/app/plugins/datasource/elasticsearch/hooks/useFields.ts

Co-authored-by: Giordano Ricci <grdnricci@gmail.com>

* Checking for possible nil value

* Fixing types

* fix fake-data-gen param

* fix useFields hook

* Removing aggregateBy and size

* Fixing go tests

* Fixing TS tests

* fixing tests

* Fixes

* Remove date from top_metrics fields

* Restore previous formatting

* Update pkg/tsdb/elasticsearch/client/models.go

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>

* Update pkg/tsdb/elasticsearch/client/models.go

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>

* Fix code review comments on processTopMetricValue

* Remove underscore from variable names

* Remove intermediate array definition

* Refactor test to use testify

Co-authored-by: Giordano Ricci <grdnricci@gmail.com>
Co-authored-by: Elfo404 <me@giordanoricci.com>
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2021-06-04 11:07:59 +01:00
Marcus Efraimsson
35a4b2c651
Chore: Fix jaeger devenv block (#34795) 2021-05-28 08:47:18 +02:00
Gábor Farkas
49126bebaa
devenv: unify slow_proxy_mac and slow_proxy (#34630)
* devenv: update slow_proxy block to work on mac

* devenv: removed unnecessary block slow_proxy_mac
2021-05-27 08:44:35 +02:00
Gábor Farkas
0c2bb9562a
devenv: slow_proxy_mac: make configurable and smaller (#34560) 2021-05-24 10:25:30 +02:00
Andrej Ocenas
615de9bf34
Zipkin: Add node graph view to trace response (#34414)
* Add graph transform

* Add tests

* Refactor code

* Update test

* Fix zipkin block

Co-authored-by: David Kaltschmidt <david.kaltschmidt@gmail.com>
2021-05-20 10:01:28 +02:00
Marcus Efraimsson
348e76fc8e
Datasource: Shared HTTP client provider for core backend data sources and any data source using the data source proxy (#33439)
Uses new httpclient package from grafana-plugin-sdk-go introduced 
via grafana/grafana-plugin-sdk-go#328. 
Replaces the GetHTTPClient, GetTransport, GetTLSConfig methods defined 
on DataSource model.
Longer-term the goal is to migrate core HTTP backend data sources to use the 
SDK contracts and using httpclient.Provider for creating HTTP clients and such.

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-05-19 23:53:41 +02:00
Giordano Ricci
8ec87250c1
Elasticsearch: Fix handling of inline scripts in different ES versions (#34070)
* Devenv: add block for es 5.0, provisioned datasource & dashboard

* Trasnsform script property based on running ES version

* Handle different scripts format in BE
2021-05-14 11:50:15 +01:00
Gábor Farkas
f176b4818a
devenv: InfluxDB: fix version mismatch (#33484) 2021-04-28 16:39:31 +02:00
Gábor Farkas
31a6d12d34
devenv: influxdb data sources and blocks cleanup (#32894)
* devenv: influxdb cleanup

* devenv: influxdb: auto-delete now-unused gdev-data-sources
2021-04-13 15:13:50 +02:00
Ivana Huckova
a0c38e243c
Prometheus: Update devenv block without a version to the latest version (#32847)
* Change default prometheus to latest and prometheus v1 to prometheus1

* Update README

* Remove prometheus1 block as not used
2021-04-13 15:12:48 +02:00
Gábor Farkas
13371493ae
devenv: influxdb2: updated to 2.0.4, fixed config (#32809) 2021-04-09 13:56:19 +02:00
Torkel Ödegaard
d42a5b2561
FrontendMetrics: Adds new backend api that frontend can use to push frontend measurements and counters to prometheus (#32593)
* FrontendMetrics: Adds new backend api that frontend can use to push frontend measurements and counters to prometheus

* FrontendMetrics: Adds new backend api that frontend can use to push frontend measurements and counters to prometheus

* Fix naming

* change to histogram

* Fixed go lint
2021-04-01 20:04:02 +02:00
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
Torkel Ödegaard
1d689888b0
Prettier: Upgrade to 2 (#30387)
* Updated package json but not updated source files

* Update eslint plugin

* updated files
2021-01-20 07:59:48 +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
Dafydd
d29f73b197
devenv: Add docker load test which authenticates with API key (#28905)
* Add loadtest which authenticates with API key
- Edit load tests to assign the orgId in the default function, as the setup function is only called once for all VUs and therefore the change is not persisted to each VU.
- Remove side effect from orgId setup function and explicitly set orgId in setup client

* sort semicolons, whitespace
2020-11-24 09:34:47 +02: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
Zoltán Bedi
ae30482465
Chore: MEGA - Make Eslint Great Again 💅 (#26094)
* Fix lint error in types.ts

* Bump eslint and its deps to latest

* Add eslintignore and remove not needed eslintrcs

* Change webpack configs eslint config

* Update package.jsons and removed unused eslintrc files

* Chore yarn lint --fix 💅

* Add devenv to eslintignore

* Remove eslint disable comments for rules that are not used

* Remaining eslint fixes 💅

* Bump grafana/eslint-config 💥

* Modify package.json

No need for duplicate checks.

* Modify eslintignore to ignore data and dist folders

* Revert removing .eslintrc to make sure not to use certain packages

* Modify package.json to remove not needed command

* Use gitignore for ignoring paths
2020-08-11 17:52:44 +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
Jon Gyllenswärd
f2254081c2
added out option (#24052)
* added out option

* Added example in readme
2020-04-30 10:53:19 +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
Sofia Papagiannaki
5ae95190ed
Annotations: Change indices and rewrites annotation find query to improve database query performance (#21915)
Drop indices and create new ones and rewrites annotation find query 
to address performance issues when querying annotation table and 
there is a large amount of rows.

Fixes #21902

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Kyle Brandt <kyle@kbrandt.com>
2020-02-05 16:52:41 +01:00
Marcus Andersson
f46ee12364
Build: Added devenv docker block for testing grafana with traefik. 2020-01-27 11:29:04 +01:00
Anthony Woods
f56f54b1a3 Auth: Rotate auth tokens at the end of requests (#21347)
By rotating the auth tokens at the end of the request we ensure
that there is minimum delay between a new token being generated
and the client receiving it.
Adds auth token slow load test which uses random latency for all 
tsdb queries..
Cleans up datasource proxy response handling.
DefaultHandler in middleware tests should write a response, the 
responseWriter BeforeFuncs wont get executed unless a response
is written.

Fixes #18644 

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2020-01-15 13:03:12 +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
Brenda Harjala
c9e566b156 Docs: Minor edits to the README and several md files (#19238)
* Update README.md

Capitalized the G and S in "Getting Started," and moved "guide" to match the section title in the docs.

* Fixed sentence structure. Changed "download" to "grafana.com/get" and changed "get" to "download".

* Docs: Replace "datasources" with "data sources" (#19111)

* Docs: Replace "datasources" with "data sources" (#19111)

* Docs: Replace "datasources" with "data sources" (#19111)

* Docs: Replace "datasources" with "data sources" (#19111)

* Docs: Replace "datasources" with "data sources" (#19111)

* Docs: Replace "datasources" with "data sources" (#19111)

* Docs: Replace "datasources" with "data sources" (#19111)

* Docs: Replace "datasources" with "data sources" (#19111)

*  Docs: Replace "datasources" with "data sources" (#19111)

* Docs: Replace "datasources" with "data sources" (#19111)

* Docs: Replace "datasources" with "data sources" (#19111)

* Docs: Replace "datasources" with "data sources" (#19111)
2019-09-20 00:04:56 +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
Sofia Papagiannaki
18d999f1bc
Fix provision alerts generation script (#18145)
The script tries to delete previously existing alerts
but it used to fail if there were too many of them.
2019-07-17 09:49:33 +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
Marcus Efraimsson
bc3a718107
devenv: adds auth proxy load test (#17271) 2019-05-24 17:51:10 +02:00