grafana

Commit Graph

Author	SHA1	Message	Date
Stephanie Hingtgen	255d8f3326	Plugins: Remove secure socks proxy feature toggle (#66611 )	2 years ago
Giuseppe Guerra	a89202eab2	Plugins: Improve instrumentation by adding metrics and tracing (#61035 ) * WIP: Plugins tracing * Trace ID middleware * Add prometheus metrics and tracing to plugins updater * Add TODOs * Add instrumented http client * Add tracing to grafana update checker * Goimports * Moved plugins tracing to middleware * goimports, fix tests * Removed X-Trace-Id header * Fix comment in NewTracingHeaderMiddleware * Add metrics to instrumented http client * Add instrumented http client options * Removed unused function * Switch to contextual logger * Refactoring, fix tests * Moved InstrumentedHTTPClient and PrometheusMetrics to their own package * Tracing middleware: handle errors * Report span status codes when recording errors * Add tests for tracing middleware * Moved fakeSpan and fakeTracer to pkg/infra/tracing * Add TestHTTPClientTracing * Lint * Changes after PR review * Tests: Made "ended" in FakeSpan private, allow calling End only once * Testing: panic in FakeSpan if span already ended * Refactoring: Simplify Grafana updater checks * Refactoring: Simplify plugins updater error checks and logs * Fix wrong call to checkForUpdates -> instrumentedCheckForUpdates * Tests: Fix wrong call to checkForUpdates -> instrumentedCheckForUpdates * Log update checks duration, use Info log level for check succeeded logs * Add plugin context span attributes in tracing_middleware * Refactor prometheus metrics as httpclient middleware * Fix call to ProvidePluginsService in plugins_test.go * Propagate context to update checker outgoing http requests * Plugin client tracing middleware: Removed operation name in status * Fix tests * Goimports tracing_middleware.go * Goimports * Fix imports * Changed span name to plugins client middleware * Add span name assertion in TestTracingMiddleware * Removed Prometheus metrics middleware from grafana and plugins updatechecker * Add span attributes for ds name, type, uid, panel and dashboard ids * Fix http header reading in tracing middlewares * Use contexthandler.FromContext, add X-Query-Group-Id * Add test for RunStream * Fix imports * Changes from PR review * TestTracingMiddleware: Changed assert to require for didPanic assertion * Lint * Fix imports	2 years ago
Dave Henderson	c0b5d2dfaa	Tracing: Support multiple OTel propagators (#61199 ) * tracing: Support multiple OTel propagators Signed-off-by: Dave Henderson <dave.henderson@grafana.com> * tracing: add TraceIDString method to fix up tests This method will be useful elsewhere if we want to log the trace ID. * improve propagation docs Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * doc style fix Signed-off-by: Dave Henderson <dave.henderson@grafana.com> * Use tracing.TraceIDFromContext instead of adding TraceIDString method Signed-off-by: Dave Henderson <dave.henderson@grafana.com> --------- Signed-off-by: Dave Henderson <dave.henderson@grafana.com> Co-authored-by: Bryan Boreham <bjboreham@gmail.com> Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>	2 years ago
Bryan Boreham	7731a4d6af	Tracing: Add more detail to HTTP Outgoing Request (#64757 ) Add more detail to HTTP Outgoing Request. As events rather than sub-spans, to save cluttering the view.	2 years ago
Stephanie Hingtgen	10db808ea1	Plugins: Add sql support for the secure socks proxy (#64630 )	2 years ago
zhichli	3c218d742f	Datasources: Add user_agent header customization for outgoing HTTP requests (#63769 )	2 years ago
Kristin Laemmert	fe27acc3a9	chore: move validations model into the validations service (#61953 )	2 years ago
Marcus Efraimsson	c35c689a96	Plugins: Automatically forward plugin request HTTP headers in outgoing HTTP requests (#60417 ) Automatically forward core plugin request HTTP headers in outgoing HTTP requests. Core datasource plugin authors don't have to specifically handle forwarding of HTTP headers, e.g. do not have to "hardcode" the header-names in the datasource plugin, if not having custom needs. Fixes #57065	2 years ago
Marcus Efraimsson	6dbe3b555f	Plugins: Refactor forward of cookies, OAuth token and header modifications by introducing client middlewares (#58132 ) Adding support for backend plugin client middlewares. This allows headers in outgoing backend plugin and HTTP requests to be modified using client middlewares. The following client middlewares added: Forward cookies: Will forward incoming HTTP request Cookies to outgoing plugins.Client and HTTP requests if the datasource has enabled forwarding of cookies (keepCookies). Forward OAuth token: Will set OAuth token headers on outgoing plugins.Client and HTTP requests if the datasource has enabled Forward OAuth Identity (oauthPassThru). Clear auth headers: Will clear any outgoing HTTP headers that was part of the incoming HTTP request and used when authenticating to Grafana. The current suggested way to register client middlewares is to have a separate package, pluginsintegration, responsible for bootstrap/instantiate the backend plugin client with middlewares and/or longer term bootstrap/instantiate plugin management. Fixes #54135 Related to #47734 Related to #57870 Related to #41623 Related to #57065	3 years ago
Stephanie Hingtgen	6805c951e9	Plugins: add option to proxy ds connections through a secure socks proxy (#59254 ) * Plugins: add feature to proxy data source connections	3 years ago
Marcus Efraimsson	6f8fcae01b	[main] Plugin fixes (#57399 ) * Plugins: Remove support for V1 manifests * Plugins: Make proxy endpoints not leak sensitive HTTP headers * Security: Fix do not forward login cookie in outgoing requests (cherry picked from commit `4539c33fce`) Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	3 years ago
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	3 years ago
Todd Treece	b5d57c45e3	Plugins: Add support for HTTP logger (#46578 )	3 years ago
Dave Henderson	096330c53b	datasource metrics: Correct help text for histograms (#50942 ) In #50420 a few summary metrics were converted to histograms, but the Help text in a couple of them still referred to summaries. This fixes that help text. Signed-off-by: Dave Henderson <dave.henderson@grafana.com>	3 years ago
Ben Kochie	68691d7775	Convert some metrics to Histograms (#50420 ) Because Summary metrics can not be aggreated, convert them to histograms so that users with HA deployments can use these metrics. * Convert metrics registration to promauto. * Improve help text style. Signed-off-by: SuperQ <superq@gmail.com>	3 years ago
Serge Zaitsev	ae9491c3a7	Chore: Make test tracer noop and return no errors (#50797 )	3 years ago
Todd Treece	99db588919	Data Sources: Add QueryData OAuth & cookie forwarding middleware (#50466 )	3 years ago
Marcus Efraimsson	cddab15769	Chore: Upgrade grafana-plugin-sdk-go to v0.137.0 (#50443 ) Co-authored-by: Todd Treece <todd.treece@grafana.com>	3 years ago
Leonard Gram	aad2983350	Security: fixes CVE-2022-29170 (#49240 ) * Request interceptor: block redirects * handle location missing * Update pkg/infra/httpclient/httpclientprovider/host_redirect_validation_middleware.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Update pkg/infra/httpclient/httpclientprovider/host_redirect_validation_middleware.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * linter * fixes tests Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	3 years ago
Sergey Kostrukov	656ade9884	Shared Azure middleware between Azure Monitor and Prometheus datasources (#46002 ) * Scopes in Azure middleware * Enable Azure middleware without feature flag * Use common Azure middleware in Azure Monitor * Apply feature flag to JsonData configuration of Azure auth * Enforce feature flag in Prometheus datasource * Prometheus provider tests * Datasource service tests * Fix http client provider tests * Pass sdkhttpclient.Options by reference * Add middleware to httpclient.Options * Remove dependency on Grafana settings * Unit-tests updated * Fix ds_proxy_test * Fix service_test	3 years ago
Will Browne	fc42dfe396	Auth: Guarantee consistency of signed SigV4 headers (#45054 ) * use latest sigv4 changes * update configuration docs * lint * reformat lint ignore * specific version for docs	3 years ago
Ryan McKinley	5d66194ec5	FeatureFlags: define features outside settings.Cfg (take 3) (#44443 )	3 years ago
Sergey Kostrukov	cb09162cde	Datasources: Simplify the AzureCredentials structure in datasource config (#39209 ) Related #35857 Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	3 years ago
Agnès Toulet	65bdb3a899	FeatureFlags: Revert managing feature flags outside of settings.Cfg (#44382 ) * Revert "FeatureToggles: register all enterprise feature toggles (#44336)" This reverts commit `f53b3fb007`. * Revert "FeatureFlags: manage feature flags outside of settings.Cfg (#43692)" This reverts commit `f94c0decbd`.	3 years ago
Ryan McKinley	f94c0decbd	FeatureFlags: manage feature flags outside of settings.Cfg (#43692 )	3 years ago
idafurjes	30aa24a183	Chore: Implement OpenTelemtry in Grafana (#42674 ) * Separate Tracer interface to TracerService and Tracer * Fix lint * Fix:Make it possible to start spans for both opentracing and opentelemetry in ds proxy * Add span methods, use span interface for rest of tracing * Fix logs in tracing * Fix tests that are related to tracing * Fix resourcepermissions test * Fix some tests * Fix more tests * Add TracingService to wire cli runner * Remove GlobalTracer from bus * Renaming test function * Remove GlobalTracer from TSDB * Replace GlobalTracer in api * Adjust tests to the InitializeForTests func * Remove GlobalTracer from services * Remove GlobalTracer * Remove bus.NewTest * Remove Tracer interface * Add InitializeForBus * Simplify tests * Clean up tests * Rename TracerService to Tracer * Update pkg/middleware/request_tracing.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Initialize tracer before passing it to SQLStore initialization in commands * Remove tests for opentracing * Set span attributes correctly, remove unnecessary trace initiliazation form test * Add tracer instance to newSQLStore * Fix changes due to rebase * Add modified tracing middleware test * Fix opentracing implementation tags Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	3 years ago
Marcus Efraimsson	3be452f995	DataProxy: Fix issue overriding response body when response status is 101 (#41364 ) When a request going through Grafana data source proxy responds with a websocket upgrade response we cannot override the response body since it produces an error. This problem seems to have been introduced in Grafana v8.0 by #38962. In addition #40303 added same problem. Fixes #41292	4 years ago
Marcus Efraimsson	889d4683a1	Datasources: Set response size metric based on actual bytes read (#40303 ) Fixes #33372	4 years ago
Dimitris Sotirakis	ba9d5540b8	Datasources: Introduce `response_limit` for datasource responses (#38962 ) * Introduce response_limit for datasource responses * Fix lint * Fix tests * Add case where limit <= 0 - added parametrized tests * Add max_bytes_reader.go * Use new httpclient.MaxBytesReader instead of net/http one * Fixes according to reviewer's comments * Add tests for max_bytes_reader * Add small piece in configuration.md * Further fixes according to reviewer's comments * Fix linting - fix test	4 years ago
Arve Knudsen	78596a6756	Migrate to Wire for dependency injection (#32289 ) Fixes #30144 Co-authored-by: dsotirakis <sotirakis.dim@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com> Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> Co-authored-by: Leon Sorokin <leeoniya@gmail.com> Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com> Co-authored-by: spinillos <selenepinillos@gmail.com> Co-authored-by: Karl Persson <kalle.persson@grafana.com> Co-authored-by: Leonard Gram <leo@xlson.com>	4 years ago
Sergey Kostrukov	c1963024ec	Infra: Azure authentication in HttpClientProvider (#36932 ) * Azure middleware in HttpClientProxy * Azure authentication under feature flag * Minor fixes * Add prefixes to not clash with JsonData * Return error if JsonData cannot be parsed * Return original string if URL invalid * Tests for datasource_cache	4 years ago
Marcus Efraimsson	a6b2e1865c	Datasource: Improve default timeout settings for HTTP client provider (#36621 ) Make sure that default timeout settings are based on configuration parameters. This now applies for core data sources using old TSDB contracts and new SDK contracts. Before it was only applied for old TSDB contracts. Also moves global setting variables to non-global (setting.Cfg).	4 years ago
Dimitris Sotirakis	7cdf8b3705	HTTP Client: Introduce go-conntrack into http client provider (#35314 ) * Introduce go-conntrack into http client provider * Fixes according to reviewer's comments * Fixes according to reviewer's comments	4 years ago
Marcus Efraimsson	60d0c8d0ec	HTTP Client: Outgoing tracing middleware (#34466 ) Following #33439 this adds support for outgoing tracing middleware in HTTP client provider. Fixes #24004	4 years ago
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>	4 years ago

35 Commits (62587eee886629e40613a12decdbe3acd36318f8)