Commit Graph

124 Commits

Author SHA1 Message Date
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