Merge pull request #135 from qclaogui:multi-tenancy

enable multi-tenancy
qclaogui · May 21, 2024 · 55c53ae · 55c53ae
2 parents 5cb1f2d + e33f691
commit 55c53ae
Show file tree

Hide file tree

Showing 52 changed files with 166 additions and 175 deletions.
diff --git a/docker-compose/common/config/grafana/provisioning/datasources/datasources.yaml b/docker-compose/common/config/grafana/provisioning/datasources/datasources.yaml
@@ -22,13 +22,17 @@ datasources:
   isDefault: false
   version: 1
   editable: true
+  secureJsonData:
+    httpHeaderValue1: 'anonymous'
+    # httpHeaderValue2: 'Bearer XXXXXXXXX'
   jsonData:
+    httpHeaderName1: 'X-Scope-OrgID'
+    # httpHeaderName2: 'Authorization'
     prometheusType: Mimir
     exemplarTraceIdDestinations:
       - name: traceID
         datasourceUid: traces
 
-
 # Loki for logs
 - name: Logs
   type: loki
@@ -40,7 +44,10 @@ datasources:
   isDefault: false
   version: 1
   editable: true
+  secureJsonData:
+    httpHeaderValue1: 'anonymous'
   jsonData:
+    httpHeaderName1: 'X-Scope-OrgID'
     derivedFields:
       - datasourceUid: traces
         matcherRegex: "[tT]race_?[iI][dD]\"?[:=]\"?(\\w+)"
@@ -60,7 +67,10 @@ datasources:
   version: 1
   editable: true
   apiVersion: 1
+  secureJsonData:
+    httpHeaderValue1: 'anonymous'
   jsonData:
+    httpHeaderName1: 'X-Scope-OrgID'
     search:
       hide: false
     lokiSearch:
@@ -113,3 +123,7 @@ datasources:
   isDefault: false
   version: 1
   editable: true
+  secureJsonData:
+    httpHeaderValue1: 'anonymous'
+  jsonData:
+    httpHeaderName1: 'X-Scope-OrgID'
diff --git a/docker-compose/common/config/loki/gateway_loki.conf b/docker-compose/common/config/loki/gateway_loki.conf
@@ -8,8 +8,6 @@ server {
       access_log off;
     }
 
-    proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
-
     # Distributor endpoints
     location = /api/prom/push {
       proxy_pass      http://${LOKI_DISTRIBUTOR_HOST}:3100$request_uri;

diff --git a/docker-compose/common/config/loki/microservices-mode-logs.yaml b/docker-compose/common/config/loki/microservices-mode-logs.yaml
@@ -1,4 +1,6 @@
-auth_enabled: false
+# Multi-tenant mode is set in the configuration with auth_enabled: true
+# https://grafana.com/docs/loki/latest/operations/multi-tenancy/
+auth_enabled: true
 
 # -reporting.enabled=false
 analytics:

diff --git a/docker-compose/common/config/loki/monolithic-mode-logs.yaml b/docker-compose/common/config/loki/monolithic-mode-logs.yaml
@@ -1,4 +1,6 @@
-auth_enabled: false
+# Multi-tenant mode is set in the configuration with auth_enabled: true
+# https://grafana.com/docs/loki/latest/operations/multi-tenancy/
+auth_enabled: true
 
 # -reporting.enabled=false
 analytics:

diff --git a/docker-compose/common/config/loki/read-write-mode-logs.yaml b/docker-compose/common/config/loki/read-write-mode-logs.yaml
@@ -1,4 +1,6 @@
-auth_enabled: false
+# Multi-tenant mode is set in the configuration with auth_enabled: true
+# https://grafana.com/docs/loki/latest/operations/multi-tenancy/
+auth_enabled: true
 
 # -reporting.enabled=false
 analytics:

diff --git a/docker-compose/common/config/mimir/gateway_mimir.conf b/docker-compose/common/config/mimir/gateway_mimir.conf
@@ -8,8 +8,6 @@ server {
       access_log off;
     }
 
-    proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
-
     # Distributor endpoints
     location /distributor {
       proxy_pass      http://${MIMIR_DISTRIBUTOR_HOST}:8080$request_uri;

diff --git a/docker-compose/common/config/mimir/microservices-mode-metrics.yaml b/docker-compose/common/config/mimir/microservices-mode-metrics.yaml
@@ -1,6 +1,6 @@
 # Do not use this configuration in production.
 # It is for demonstration purposes only.
-multitenancy_enabled: false
+multitenancy_enabled: true
 
 # -usage-stats.enabled=false
 usage_stats:

diff --git a/docker-compose/common/config/mimir/monolithic-mode-metrics.yaml b/docker-compose/common/config/mimir/monolithic-mode-metrics.yaml
@@ -1,6 +1,6 @@
 # Do not use this configuration in production.
 # It is for demonstration purposes only.
-multitenancy_enabled: false
+multitenancy_enabled: true
 
 # -usage-stats.enabled=false
 usage_stats:

diff --git a/docker-compose/common/config/mimir/read-write-mode-metrics.yaml b/docker-compose/common/config/mimir/read-write-mode-metrics.yaml
@@ -1,6 +1,6 @@
 # Do not use this configuration in production.
 # It is for demonstration purposes only.
-multitenancy_enabled: false
+multitenancy_enabled: true
 
 # -usage-stats.enabled=false
 usage_stats:

diff --git a/docker-compose/common/config/nginx/nginx.conf b/docker-compose/common/config/nginx/nginx.conf
@@ -49,5 +49,7 @@ http {
     "" "anonymous";
   }
 
+  proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
+
   include /etc/nginx/gateway_*.conf;
 }
diff --git a/docker-compose/common/config/pyroscope/gateway_pyroscope.conf b/docker-compose/common/config/pyroscope/gateway_pyroscope.conf
@@ -8,8 +8,6 @@ server {
       access_log off;
     }
 
-    proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
-
     # Distributor endpoints
     location /push.v1.PusherService {
       proxy_pass      http://${PYROSCOPE_DISTRIBUTOR_HOST}:4040$request_uri;

diff --git a/docker-compose/common/config/pyroscope/microservices-mode-profiles.yaml b/docker-compose/common/config/pyroscope/microservices-mode-profiles.yaml
@@ -1,4 +1,4 @@
-multitenancy_enabled: false
+multitenancy_enabled: true
 analytics:
   reporting_enabled: false
 

diff --git a/docker-compose/common/config/pyroscope/monolithic-mode-profiles.yaml b/docker-compose/common/config/pyroscope/monolithic-mode-profiles.yaml
@@ -1,4 +1,4 @@
-multitenancy_enabled: false
+multitenancy_enabled: true
 analytics:
   reporting_enabled: false
 

diff --git a/docker-compose/common/config/tempo/gateway_tempo.conf b/docker-compose/common/config/tempo/gateway_tempo.conf
@@ -33,8 +33,6 @@ server {
       access_log off;
     }
 
-    proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
-
     # Distributor endpoints
     location = /jaeger/api/traces {
       proxy_pass      http://${TEMPO_DISTRIBUTOR_HOST}:14268/api/traces;

diff --git a/docker-compose/common/config/tempo/microservices-mode-traces.yaml b/docker-compose/common/config/tempo/microservices-mode-traces.yaml
@@ -3,7 +3,7 @@
 
 stream_over_http_enabled: true
 
-multitenancy_enabled: false
+multitenancy_enabled: true
 usage_report:
   reporting_enabled: false
 

diff --git a/docker-compose/common/config/tempo/monolithic-mode-traces.yaml b/docker-compose/common/config/tempo/monolithic-mode-traces.yaml
@@ -3,7 +3,7 @@
 
 stream_over_http_enabled: true
 
-multitenancy_enabled: false
+multitenancy_enabled: true
 usage_report:
   reporting_enabled: false
 

diff --git a/kubernetes/common/gateway/manifests/k8s-all-in-one.yaml b/kubernetes/common/gateway/manifests/k8s-all-in-one.yaml
@@ -53,11 +53,13 @@ data:
         "" "anonymous";
       }
 
+      proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
+
       include /etc/nginx/gateway_*.conf;
     }
 kind: ConfigMap
 metadata:
-  name: nginx-conf-d76dbg78td
+  name: nginx-conf-fbc5k874b5
   namespace: gateway
 ---
 apiVersion: v1
@@ -466,8 +468,6 @@ data:
           access_log off;
         }
 
-        proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
-
         # Distributor endpoints
         location = /api/prom/push {
           proxy_pass      http://${LOKI_DISTRIBUTOR_HOST}:3100$request_uri;
@@ -569,9 +569,9 @@ data:
       }
   gateway_mimir.conf.template: "server {\n    listen 8080;\n    listen [::]:8080;\n\n
     \   location = / {\n      return 200 'OK';\n      auth_basic off;\n      access_log
-    off;\n    }\n\n    proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;\n\n
-    \   # Distributor endpoints\n    location /distributor {\n      proxy_pass      http://${MIMIR_DISTRIBUTOR_HOST}:8080$request_uri;\n
-    \   }\n    location = /api/v1/push {\n      proxy_pass      http://${MIMIR_DISTRIBUTOR_HOST}:8080$request_uri;\n
+    off;\n    }\n\n    # Distributor endpoints\n    location /distributor {\n      proxy_pass
+    \     http://${MIMIR_DISTRIBUTOR_HOST}:8080$request_uri;\n    }\n    location
+    = /api/v1/push {\n      proxy_pass      http://${MIMIR_DISTRIBUTOR_HOST}:8080$request_uri;\n
     \   }\n    location /otlp/v1/metrics {\n      proxy_pass      http://${MIMIR_DISTRIBUTOR_HOST}:8080$request_uri;\n
     \   }\n\n    # Alertmanager endpoints\n    location /alertmanager {\n      proxy_pass
     \     http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;\n    }\n    location
@@ -601,8 +601,6 @@ data:
           access_log off;
         }
 
-        proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
-
         # Distributor endpoints
         location /push.v1.PusherService {
           proxy_pass      http://${PYROSCOPE_DISTRIBUTOR_HOST}:4040$request_uri;
@@ -709,7 +707,7 @@ spec:
         projected:
           sources:
           - configMap:
-              name: nginx-conf-d76dbg78td
+              name: nginx-conf-fbc5k874b5
           - configMap:
               name: nginx-templates
       - emptyDir: {}

diff --git a/kubernetes/common/gateway/nginx/gateway_loki.conf b/kubernetes/common/gateway/nginx/gateway_loki.conf
@@ -8,8 +8,6 @@ server {
       access_log off;
     }
 
-    proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
-
     # Distributor endpoints
     location = /api/prom/push {
       proxy_pass      http://${LOKI_DISTRIBUTOR_HOST}:3100$request_uri;

diff --git a/kubernetes/common/gateway/nginx/gateway_mimir.conf b/kubernetes/common/gateway/nginx/gateway_mimir.conf
@@ -8,8 +8,6 @@ server {
       access_log off;
     }
 
-    proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
-
     # Distributor endpoints
     location /distributor {
       proxy_pass      http://${MIMIR_DISTRIBUTOR_HOST}:8080$request_uri;

diff --git a/kubernetes/common/gateway/nginx/gateway_pyroscope.conf b/kubernetes/common/gateway/nginx/gateway_pyroscope.conf
@@ -8,8 +8,6 @@ server {
       access_log off;
     }
 
-    proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
-
     # Distributor endpoints
     location /push.v1.PusherService {
       proxy_pass      http://${PYROSCOPE_DISTRIBUTOR_HOST}:4040$request_uri;

diff --git a/kubernetes/common/gateway/nginx/nginx.conf b/kubernetes/common/gateway/nginx/nginx.conf
@@ -45,5 +45,7 @@ http {
     "" "anonymous";
   }
 
+  proxy_set_header X-Scope-OrgID $ensured_x_scope_orgid;
+
   include /etc/nginx/gateway_*.conf;
 }