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>

devenv/datasources.yaml

@@ -227,20 +227,6 @@ datasources:
       defaultRegion: eu-west-2
       defaultRegion: eu-west-2
       customMetricsNamespaces: "CWAgent"
       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
   - name: gdev-loki
     type: loki
     type: loki
     access: proxy
     access: proxy

devenv/datasources_docker.yaml

@@ -227,20 +227,6 @@ datasources:
       authType: credentials
       authType: credentials
       defaultRegion: eu-west-2
       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
   - name: gdev-loki
     type: loki
     type: loki
     access: proxy
     access: proxy

devenv/docker/blocks/loki0.3/config.yaml

-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

devenv/docker/blocks/loki0.3/docker-compose.yaml

-  # 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

devenv/docker/blocks/loki0.4/config.yaml

-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

devenv/docker/blocks/loki0.4/docker-compose.yaml

-  # 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

devenv/docker/blocks/prometheus2/Dockerfile

-FROM prom/prometheus:v2.7.2
+FROM prom/prometheus:latest
 ADD prometheus.yml /etc/prometheus/
 ADD prometheus.yml /etc/prometheus/
 ADD recording.yml /etc/prometheus/
 ADD recording.yml /etc/prometheus/
 ADD alert.yml /etc/prometheus/
 ADD alert.yml /etc/prometheus/

e2e/suite1/specs/trace-view-scrolling.spec.ts

@@ -3,7 +3,7 @@ import { e2e } from '@grafana/e2e';
 describe('Trace view', () => {
 describe('Trace view', () => {
   it('Can lazy load big traces', () => {
   it('Can lazy load big traces', () => {
     e2e.flows.login('admin', 'admin');
     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',
       fixture: 'long-trace-response.json',
     });
     });