public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,985 Commits 655 Branches 650 Tags
38fdfd6bfcfafbc42f89cd243292437d43d3293b
Commit Graph

194 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
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
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
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
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
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
Jo e3ea7ee145 Doc: Add groups mapping config to readme (#58208) 2022-11-04 10:43:38 +01: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
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