From 58968e1ceb2b0f483021fa365cdef6afdf7d70dc Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Fri, 19 Feb 2021 18:06:09 +0100 Subject: [PATCH] Devenv: Remove old-versioned loki blocks and update prometheus2 block (#31282) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- devenv/datasources.yaml | 14 ---------- devenv/datasources_docker.yaml | 14 ---------- devenv/docker/blocks/loki0.3/config.yaml | 27 ------------------- .../docker/blocks/loki0.3/docker-compose.yaml | 15 ----------- devenv/docker/blocks/loki0.4/config.yaml | 27 ------------------- .../docker/blocks/loki0.4/docker-compose.yaml | 15 ----------- devenv/docker/blocks/prometheus2/Dockerfile | 2 +- e2e/suite1/specs/trace-view-scrolling.spec.ts | 2 +- 8 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 devenv/docker/blocks/loki0.3/config.yaml delete mode 100644 devenv/docker/blocks/loki0.3/docker-compose.yaml delete mode 100644 devenv/docker/blocks/loki0.4/config.yaml delete mode 100644 devenv/docker/blocks/loki0.4/docker-compose.yaml diff --git a/devenv/datasources.yaml b/devenv/datasources.yaml index 477d361d71d..405c69436ab 100644 --- a/devenv/datasources.yaml +++ b/devenv/datasources.yaml @@ -227,20 +227,6 @@ datasources: defaultRegion: eu-west-2 customMetricsNamespaces: "CWAgent" - # Keep to test old /api/prom API - - name: gdev-loki-0.3 - type: loki - access: proxy - url: http://localhost:3103 - editable: false - - # First version with new v1 API (remove once v1 is out) - - name: gdev-loki-0.4 - type: loki - access: proxy - url: http://localhost:3104 - editable: false - - name: gdev-loki type: loki access: proxy diff --git a/devenv/datasources_docker.yaml b/devenv/datasources_docker.yaml index 12ca1388ed2..d7abd11fb3b 100644 --- a/devenv/datasources_docker.yaml +++ b/devenv/datasources_docker.yaml @@ -227,20 +227,6 @@ datasources: authType: credentials defaultRegion: eu-west-2 - # Keep to test old /api/prom API - - name: gdev-loki-0.3 - type: loki - access: proxy - url: http://loki0.3:3100 - editable: false - - # First version with new v1 API (remove once v1 is out) - - name: gdev-loki-0.4 - type: loki - access: proxy - url: http://loki0.4:3100 - editable: false - - name: gdev-loki type: loki access: proxy diff --git a/devenv/docker/blocks/loki0.3/config.yaml b/devenv/docker/blocks/loki0.3/config.yaml deleted file mode 100644 index e23620db2aa..00000000000 --- a/devenv/docker/blocks/loki0.3/config.yaml +++ /dev/null @@ -1,27 +0,0 @@ -server: - http_listen_port: 9080 - grpc_listen_port: 0 - -positions: - filename: /tmp/positions.yaml - -client: - url: http://loki0.3:3100/api/prom/push - -scrape_configs: - - job_name: system - entry_parser: raw - static_configs: - - targets: - - localhost - labels: - job: varlogs - __path__: /var/log/*log - - job_name: grafana - entry_parser: raw - static_configs: - - targets: - - localhost - labels: - job: grafana - __path__: /var/log/grafana/*log diff --git a/devenv/docker/blocks/loki0.3/docker-compose.yaml b/devenv/docker/blocks/loki0.3/docker-compose.yaml deleted file mode 100644 index 4314ea14329..00000000000 --- a/devenv/docker/blocks/loki0.3/docker-compose.yaml +++ /dev/null @@ -1,15 +0,0 @@ - # datasource URL: http://localhost:3103/ - loki0.3: - image: grafana/loki:v0.3.0 - ports: - - "3103:3100" - command: -config.file=/etc/loki/local-config.yaml - - promtail0.3: - image: grafana/promtail:v0.3.0 - volumes: - - ./docker/blocks/loki0.3/config.yaml:/etc/promtail/docker-config.yaml - - /var/log:/var/log - - ../data/log:/var/log/grafana - command: - -config.file=/etc/promtail/docker-config.yaml diff --git a/devenv/docker/blocks/loki0.4/config.yaml b/devenv/docker/blocks/loki0.4/config.yaml deleted file mode 100644 index 57c502b21a0..00000000000 --- a/devenv/docker/blocks/loki0.4/config.yaml +++ /dev/null @@ -1,27 +0,0 @@ -server: - http_listen_port: 9080 - grpc_listen_port: 0 - -positions: - filename: /tmp/positions.yaml - -client: - url: http://loki0.4:3100/api/prom/push - -scrape_configs: - - job_name: system - entry_parser: raw - static_configs: - - targets: - - localhost - labels: - job: varlogs - __path__: /var/log/*log - - job_name: grafana - entry_parser: raw - static_configs: - - targets: - - localhost - labels: - job: grafana - __path__: /var/log/grafana/*log diff --git a/devenv/docker/blocks/loki0.4/docker-compose.yaml b/devenv/docker/blocks/loki0.4/docker-compose.yaml deleted file mode 100644 index 79035616820..00000000000 --- a/devenv/docker/blocks/loki0.4/docker-compose.yaml +++ /dev/null @@ -1,15 +0,0 @@ - # datasource URL: http://localhost:3104/ - loki0.4: - image: grafana/loki:v0.4.0 - ports: - - "3104:3100" - command: -config.file=/etc/loki/local-config.yaml - - promtail0.4: - image: grafana/promtail:v0.4.0 - volumes: - - ./docker/blocks/loki0.4/config.yaml:/etc/promtail/docker-config.yaml - - /var/log:/var/log - - ../data/log:/var/log/grafana - command: - -config.file=/etc/promtail/docker-config.yaml diff --git a/devenv/docker/blocks/prometheus2/Dockerfile b/devenv/docker/blocks/prometheus2/Dockerfile index fe73ec26780..ea9fc071e3c 100644 --- a/devenv/docker/blocks/prometheus2/Dockerfile +++ b/devenv/docker/blocks/prometheus2/Dockerfile @@ -1,4 +1,4 @@ -FROM prom/prometheus:v2.7.2 +FROM prom/prometheus:latest ADD prometheus.yml /etc/prometheus/ ADD recording.yml /etc/prometheus/ ADD alert.yml /etc/prometheus/ diff --git a/e2e/suite1/specs/trace-view-scrolling.spec.ts b/e2e/suite1/specs/trace-view-scrolling.spec.ts index 1f52839d16a..58313697072 100644 --- a/e2e/suite1/specs/trace-view-scrolling.spec.ts +++ b/e2e/suite1/specs/trace-view-scrolling.spec.ts @@ -3,7 +3,7 @@ import { e2e } from '@grafana/e2e'; describe('Trace view', () => { it('Can lazy load big traces', () => { e2e.flows.login('admin', 'admin'); - e2e().intercept('GET', '/api/datasources/proxy/29/api/traces/long-trace', { + e2e().intercept('GET', '/api/traces/long-trace', { fixture: 'long-trace-response.json', });