Commit Graph

284 Commits

Author SHA1 Message Date
Joey
10d896d24e
Tracing: Docs and config improvements for Tempo/Jaeger/Zipkin (#65255)
* Docs and config improvements

* Add note

* Add traceToLogs (v1) in provisioning example

* Remove old provisioning

* PR updates
2023-03-30 07:41:27 +01:00
Gábor Farkas
6559971c02
devenv: elastic: remove unnecessary console logging (#65160) 2023-03-22 11:50:45 +01:00
Joey
b1a7e1d33d
Tempo: Update service graph view and docs (#64875)
Update service graph view and docs
2023-03-22 08:37:44 +00:00
gotjosh
406431df4e
Alerting: QoL improvements to the unified alerting multi-replica devenv (#64907) 2023-03-17 07:14:31 +00:00
Jo
8bb10f87e9
Auth: Update authentik devenv and add oauth (#64691)
update authentik devenv and add oauth
2023-03-13 15:13:16 +01:00
Gábor Farkas
f76d634ac6
devenv: loki: generate timestamps with various precision (#64509) 2023-03-10 15:09:59 +00:00
Ryan McKinley
380138f57b
Chore: update yarn lock in loadtest environment (#64278)
* update yarn lock

* remove loadtest-ts

---------

Co-authored-by: Artur Wierzbicki <artur.wierzbicki@grafana.com>
2023-03-07 07:36:17 -08:00
Gábor Farkas
117bff6459
loki: devenv: improved fake data generator (#63237) 2023-02-10 03:43:42 -05:00
Eric Leijonmarck
27f0c9c70f
Auth: Doc change url for getting JWT (#62319)
docs: change url for getting JWT
2023-01-27 14:26:35 +01:00
Matias Chomicki
641a7182e3
Loki Docker Devenv: Fix undefined variable in error message (#62242)
fix(loki-docker-devenv): fix undefined variable in error message
2023-01-26 16:15:11 +00:00
Andre Pereira
81c35560a8
Chore: Update the tempo devenv with the latest Tempo config changes (#61622)
* Update the tempo devenv with the latest Tempo config changes

* Remove some settings to instead use the default values

* Pin the Tempo image to the current latest version

Co-authored-by: Hamas Shafiq <hamas.shafiq@grafana.com>
2023-01-24 11:08:40 +00:00
Gareth Dawson
35c7bbef57
Loki: Add ingester to the devenv loki config (#61844)
feat: update loki config
2023-01-23 15:09:57 +00:00
Sven Grossmann
faf07716ee
Loki: Use tsdb index in devenv (#61737)
update loki config to use new TSDB
2023-01-19 09:29:09 +01:00
linoman
8ba5f59fb7
Promote openldap-mac (#61332)
* Replace `openldap` with `openldap-mac`

* Rename all references for `openldap-mac`

* Rename prepopulated users with first names
2023-01-12 10:20:01 +01:00
Jo
5f6f1a7d07
Devenv: Update to keycloak 20 (#61174)
update to keycloak 20
2023-01-10 16:50:53 +01:00
Jo
0c8ad80575
Authn: JWT client (#61157)
* add jwt client

* alias JWT verifier

* debug implementation

* add tests for jwt client

* add constant for JWT module

* Feedback

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com>

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com>
2023-01-10 15:08:52 +01:00
Andrej Ocenas
85d8d9c00b
Phlare: Add devenv block (#60911)
Add Phlare devenv block
2023-01-04 11:29:45 +01:00
Jo
ba9decfd04
Devenv: Add SAML authentik devenv (#60881)
* add SAML support to authentik devenv

* update authentik image

* mark SAML as done
2023-01-03 10:06:24 +00:00
Jo
e1ea5490b3
Devenv: Remove abandoned environment (#60882)
chore: remove abandoned environment
2023-01-03 09:30:59 +01:00
Dominik Prokop
9b7418ec17
Revert "Chore: Update typescript to 4.9.3 (#60538)" (#60774)
This reverts commit 51f5334748.
2022-12-27 06:30:52 -08:00
Yuri Tseretyan
03cd7f0295
Chore: Add mysqld exporter to devenv (#55773)
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2022-12-21 16:10:55 -05:00
Josh Hunt
51f5334748
Chore: Update typescript to 4.9.3 (#60538)
* Update typescript to 4.9.3

* Update from typescript changes
2022-12-21 10:25:29 +00:00
Sven Grossmann
6f64dd533f
Devenv: Add back loki-promtail (#60282)
* add back loki-promtail

* update README

* add MacOS note
2022-12-14 15:02:12 +01:00
Misi
7bb5200cc2
Devenv: OpenLDAP-Mac improvements (#60229)
* Use groupOfUniqueNames and uniqueMember

* Update README.md
2022-12-13 18:20:37 +01:00
Sven Grossmann
a62e437eb3
DevEnv: Add default loki configuration (#59058)
add local default config
2022-11-21 17:12:27 +01:00
lean.dev
83bd57244d
Chore: Update version (#58750) 2022-11-15 10:03:05 -03:00
Sasha Melentyev
febcaeff3a
Chore: Use strings.ReplaceAll and preallocate containers (#58483) 2022-11-09 17:17:09 +01:00
Gábor Farkas
29fcc46333
devenv:elastic: update version (#58439) 2022-11-08 15:00:23 +00:00
Conor Evans
40ba2ba18d
fix(config/jwt): the value should be "expect_claims", not "expected_claims" (#58284)
Signed-off-by: Conor Evans <coevans@tcd.ie>
2022-11-07 12:29:27 +00:00
renovate[bot]
3f38c95377
Update dependency @types/k6 to v0.41.0 (#58165)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-11-04 10:42:45 +00:00
Jo
e3ea7ee145
Doc: Add groups mapping config to readme (#58208) 2022-11-04 10:43:38 +01:00
renovate[bot]
17f7cbf0f6
Update dependency babel-loader to v9.1.0 (#58155)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-11-04 09:20:27 +00:00
renovate[bot]
909d0f4ced
Update Monthly patch updates (#58002)
* Update Monthly patch updates

* update typescript sdk, add ignore for emotion css prop

* fix unit tests

* type fixes

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2022-11-02 12:05:32 +00:00
renovate[bot]
656f159ae9
Update babel monorepo (#57665)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-10-31 09:25:01 +00:00
Jo
61774ae7f1
Docs: Add keycloak oauth setup guide (#57685)
* use scopes for generic_oauth devenv. Support refresh_tokens

* add keycloak section

* add teamsync support to oauth devenv

* Add keycloak guide

* Upgrade keycloak to version 19

* Update devenv/docker/blocks/auth/oauth/readme.md

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>

* feedback

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

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2022-10-28 17:57:56 -04:00
Artur Wierzbicki
616db7f68b
Storage: k6 tests (#57496)
* object store k6

* update script

* refactor

* rename scripts

* fix paths

* fixes

* fix client - check connected state

* add teardown timeout

* rename to grpc object store client

* fail if health check fails

* abort rather than fail

* stale import

* create `run.sh`

* adjust for dummy server

* fix mkdir

* clean up dependencies

* remove name and version

* bring back name and version!

* remove clean webpackk plugin

* remove copy plugin

* update yarn lock

* remove stale import

* update yarn lock

* move perf tests to devenv/docker/loadtest-ts

* add codeownres
2022-10-27 23:22:04 +08:00
Jo
77437f2c89
Add multi-auth devenv (#57609)
* add authentik devenv

* remove direct dependency on spew

* use cn

* add authentik instructions

* add backup instructions
2022-10-26 13:46:50 +02:00
Hamas Shafiq
84a5ced72a
Tempo: Integrate TraceQL API (#56867) 2022-10-20 10:44:59 -04:00
Gábor Farkas
e8cad52132
devenv: fix loki&elastic naming conflict (#57268) 2022-10-20 07:49:52 +00:00
Ivana Huckova
a4c5801440
Loki: Fix redundant escaping in adhoc filter with regex match (#56447)
* Loki: Fix redundant escaping in adhoc filter with regex match

* Update data.js

* Simplify test

* Simplify test

* Update

* Add more tests
2022-10-07 16:21:59 +02:00
Gábor Farkas
d1375d31cd
devenv: loki: remove unused devenv-config (#55752)
* devenv: jaeger: add it's own copy of promtail-config

* devenv: removed unused loki config
2022-09-27 11:58:08 +02:00
owensmallwood
64dd9a0898
Adds docker block for clickhouse (#55702)
Adds clickhouse docker-compose block
2022-09-26 10:44:25 -06:00
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