fix(grafana-datasource): Grafana Datasource pointing to wrong service (#6819)

Signed-off-by: Ajay-Satish-01 <[email protected]>

Author: Ajay-Satish-01

docs/getting-started/_index.md

@@ -51,6 +51,8 @@ $ git clone https://github.com/cortexproject/cortex.git
 $ cd cortex/docs/getting-started
 ```
 
+**Note**: This guide uses `grafana-datasource-docker.yaml` which is specifically configured for the single binary Docker Compose deployment. For Kubernetes/microservices mode, use `grafana-datasource.yaml` instead.
+
 ##### Start the services
 
 ```sh
@@ -215,6 +217,8 @@ how this is configured.
 $ helm upgrade --install --version=7.3.9 --namespace cortex grafana grafana/grafana -f grafana-values.yaml --wait
 ```
 
+**Note**: This guide uses `grafana-values.yaml` with Helm to configure Grafana datasources. Alternatively, you can manually deploy Grafana with `grafana-datasource.yaml` which is specifically configured for Kubernetes/microservices mode with the correct `cortex-nginx` endpoints.
+
 ```sh
 # Create dashboards for Cortex
 $ for dashboard in $(ls dashboards); do

docs/getting-started/docker-compose.yaml

@@ -20,10 +20,10 @@ services:
     ports:
       - "9009:9009"
     healthcheck:
-        test: wget -qO- http://127.0.0.1:9009/ready
-        interval: 10s
-        timeout: 10s
-        retries: 3
+      test: wget -qO- http://127.0.0.1:9009/ready
+      interval: 10s
+      timeout: 10s
+      retries: 3
     restart: on-failure
   grafana:
     image: grafana/grafana:${GRAFANA_VERSION}
@@ -34,7 +34,7 @@ services:
       - GF_LOG_MODE=console
       - GF_LOG_LEVEL=critical
     volumes:
-      - ./grafana-datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yaml:ro
+      - ./grafana-datasource-docker.yaml:/etc/grafana/provisioning/datasources/datasource.yaml:ro
       - ./grafana-dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml:ro
       - ./dashboards/:/var/lib/grafana/dashboards/:ro
     ports:
@@ -66,7 +66,7 @@ services:
     ports:
       - "8333:8333"
     post_start:
-    - command: /seaweedfs-init.sh
+      - command: /seaweedfs-init.sh
     volumes:
       - ./seaweedfs-config.json:/workspace/seaweedfs-config.json:ro
       - ./seaweedfs-init.sh:/seaweedfs-init.sh:ro

docs/getting-started/grafana-datasource-docker.yaml

@@ -0,0 +1,73 @@
+# Grafana datasource configuration for Docker Compose/single binary mode
+# For Kubernetes mode, use grafana-datasource.yaml instead
+apiVersion: 1
+
+datasources:
+  - name: Cortex
+    type: prometheus
+    access: proxy
+    orgId: 1
+    url: http://cortex:9009/api/prom
+    jsonData: &jsonData
+      cacheLevel: None
+      httpHeaderName1: X-Scope-OrgID
+      httpMethod: POST
+      prometheusType: Cortex
+      prometheusVersion: 1.14.0
+      timeInterval: 15s
+    secureJsonData:
+      httpHeaderValue1: cortex
+    version: 1
+    editable: true
+    isDefault: true
+  - name: Tenant A
+    type: prometheus
+    access: proxy
+    orgId: 1
+    url: http://cortex:9009/api/prom
+    jsonData: *jsonData
+    secureJsonData:
+      httpHeaderValue1: tenant-a
+    version: 1
+    editable: true
+  - name: Tenant B
+    type: prometheus
+    access: proxy
+    orgId: 1
+    url: http://cortex:9009/api/prom
+    jsonData: *jsonData
+    secureJsonData:
+      httpHeaderValue1: tenant-b
+    version: 1
+    editable: true
+  - name: Tenant C
+    type: prometheus
+    access: proxy
+    orgId: 1
+    url: http://cortex:9009/api/prom
+    jsonData: *jsonData
+    secureJsonData:
+      httpHeaderValue1: tenant-c
+    version: 1
+    editable: true
+  - name: Tenant D
+    type: prometheus
+    access: proxy
+    orgId: 1
+    url: http://cortex:9009/api/prom
+    jsonData: *jsonData
+    secureJsonData:
+      httpHeaderValue1: tenant-d
+    version: 1
+    editable: true
+  - orgId: 1
+    name: Cortex Alertmanager
+    type: alertmanager
+    access: proxy
+    url: http://cortex:9009/
+    jsonData:
+      httpHeaderName1: X-Scope-OrgID
+      implementation: cortex
+    secureJsonData:
+      httpHeaderValue1: cortex
+    version: 1

docs/getting-started/grafana-datasource.yaml

@@ -1,11 +1,13 @@
+# Grafana datasource configuration for Kubernetes/microservices mode
+# For Docker Compose mode, use grafana-datasource-docker.yaml instead
 apiVersion: 1
 
 datasources:
   - name: Cortex
     type: prometheus
     access: proxy
     orgId: 1
-    url: http://cortex:9009/api/prom
+    url: http://cortex-nginx/api/prom
     jsonData: &jsonData
       cacheLevel: None
       httpHeaderName1: X-Scope-OrgID
@@ -22,7 +24,7 @@ datasources:
     type: prometheus
     access: proxy
     orgId: 1
-    url: http://cortex:9009/api/prom
+    url: http://cortex-nginx/api/prom
     jsonData: *jsonData
     secureJsonData:
       httpHeaderValue1: tenant-a
@@ -32,7 +34,7 @@ datasources:
     type: prometheus
     access: proxy
     orgId: 1
-    url: http://cortex:9009/api/prom
+    url: http://cortex-nginx/api/prom
     jsonData: *jsonData
     secureJsonData:
       httpHeaderValue1: tenant-b
@@ -42,7 +44,7 @@ datasources:
     type: prometheus
     access: proxy
     orgId: 1
-    url: http://cortex:9009/api/prom
+    url: http://cortex-nginx/api/prom
     jsonData: *jsonData
     secureJsonData:
       httpHeaderValue1: tenant-c
@@ -52,7 +54,7 @@ datasources:
     type: prometheus
     access: proxy
     orgId: 1
-    url: http://cortex:9009/api/prom
+    url: http://cortex-nginx/api/prom
     jsonData: *jsonData
     secureJsonData:
       httpHeaderValue1: tenant-d
@@ -62,7 +64,7 @@ datasources:
     name: Cortex Alertmanager
     type: alertmanager
     access: proxy
-    url: http://cortex:9009/
+    url: http://cortex-nginx/
     jsonData:
       httpHeaderName1: X-Scope-OrgID
       implementation: cortex