chore(grafana): simplify the connection controller

Author: duanhongyi

charts/grafana/templates/_helpers.tmpl

@@ -19,17 +19,19 @@ env:
       name: valkey-creds
       key: password
 - name: DRYCC_VALKEY_URL
-  value: "redis://:$(DRYCC_VALKEY_PASSWORD)@drycc-valkey.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:16379/0"
+  value: "redis://:$(DRYCC_VALKEY_PASSWORD)@drycc-valkey:16379/0"
 {{- end }}
 - name: DRYCC_SERVICE_KEY
   valueFrom:
     secretKeyRef:
       name: controller-creds
       key: service-key
+- name: "DRYCC_CONTROLLER_URL"
+  value: http://drycc-controller-api
 - name: "DRYCC_QUICKWIT_URL"
-  value: "http://$(DRYCC_CONTROLLER_API_SERVICE_HOST):$(DRYCC_CONTROLLER_API_SERVICE_PORT)/v2/quickwit/drycc"
+  value: "$(DRYCC_CONTROLLER_URL)/v2/quickwit/drycc"
 - name: "DRYCC_VICTORIAMETRICS_URL"
-  value: "http://$(DRYCC_CONTROLLER_API_SERVICE_HOST):$(DRYCC_CONTROLLER_API_SERVICE_PORT)/v2/prometheus/drycc"
+  value: "$(DRYCC_CONTROLLER_URL)/v2/prometheus/drycc"
 {{- if .Values.passport.enabled}}
 - name: "DRYCC_PASSPORT_URL"
 {{- if .Values.global.certManagerEnabled }}
@@ -72,7 +74,7 @@ env:
       name: database-creds
       key: password
 - name: GF_DATABASE_URL
-  value: "postgres://$(GF_DATABASE_USER):$(GF_DATABASE_PASSWORD)@drycc-database.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:5432/grafana"
+  value: "postgres://$(GF_DATABASE_USER):$(GF_DATABASE_PASSWORD)@drycc-database:5432/grafana"
 {{- end }}
 - name: "GF_SECURITY_ADMIN_USER"
   valueFrom:
@@ -91,7 +93,7 @@ env:
   value: http://drycc-grafana.{{ .Values.global.platformDomain }}
 {{- end}}
 - name: GF_UNIFIED_ALERTING_HA_PEERS
-  value: "drycc-grafana.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:9094"
+  value: "drycc-grafana:9094"
 - name: GF_UNIFIED_ALERTING_HA_ADVERTISE_ADDRESS
   value: "$(POD_IP):9094"
 {{- range $key, $value := .Values.environment }}

charts/grafana/values.yaml

@@ -95,11 +95,6 @@ victoriametrics:
   enabled: true
 
 global:
-  # A domain name consists of one or more parts.
-  # Periods (.) are used to separate these parts.
-  # Each part must be 1 to 63 characters in length and can contain lowercase letters, digits, and hyphens (-).
-  # It must start and end with a lowercase letter or digit.
-  clusterDomain: "cluster.local"
   # The public resolvable hostname to build your cluster with.
   #
   # This will be the hostname that is used to build endpoints such as "drycc.$HOSTNAME"

rootfs/usr/share/grafana/oauth2/datasources/prometheus.json

@@ -1,7 +1,7 @@
 {
     "name": "Prometheus on Drycc",
     "type": "prometheus",
-    "url": "${controller_api_url}/v2/prometheus/${username}",
+    "url": "${controller_url}/v2/prometheus/${username}",
     "access": "proxy",
     "isDefault": true,
     "basicAuth": false,

rootfs/usr/share/grafana/oauth2/datasources/quickwit.json

@@ -1,7 +1,7 @@
 {
     "name": "Application Logs",
     "type": "quickwit-quickwit-datasource",
-    "url": "${controller_api_url}/v2/quickwit/${username}",
+    "url": "${controller_url}/v2/quickwit/${username}",
     "access": "proxy",
     "basicAuth": false,
     "jsonData": {

rootfs/usr/share/grafana/oauth2/hook/__pycache__/__init__.cpython-312.pyc

@@ -5,11 +5,8 @@
 from psycopg import AsyncConnection
 
 DEFAULT_HEADERS = {"Content-Type": "application/json"}
+DRYCC_CONTROLLER_URL = os.environ.get('DRYCC_CONTROLLER_URL')
 DRYCC_GRAFANA_REFRESH = os.environ.get('DRYCC_GRAFANA_REFRESH', '60s')
-DRYCC_CONTROLLER_API_URL = "http://{}:{}".format(
-    os.environ.get('DRYCC_CONTROLLER_API_SERVICE_HOST'),
-    os.environ.get('DRYCC_CONTROLLER_API_SERVICE_PORT'),
-)
 DRYCC_GRAFANA_DASHBOARD = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../")
 
 
@@ -106,14 +103,14 @@ async def sync_datasources(context: dict, token: dict, userinfo: dict):
             with open(os.path.join(datasources_path, filename)) as f:
                 template = Template(f.read())
                 datasource = json.loads(template.substitute(
-                    controller_api_url=DRYCC_CONTROLLER_API_URL,
+                    controller_url=DRYCC_CONTROLLER_URL,
                     username=userinfo["preferred_username"],
                     time_interval=DRYCC_GRAFANA_REFRESH,
                     token=drycc_token
                 ))
                 resp = await client.get(
                     api_url(f"/api/datasources/name/{datasource["name"]}"), headers=headers)
-                if  resp.status_code == 200:
+                if resp.status_code == 200:
                     if created:
                         datasource = resp.json()
                         datasource["secureJsonData"] = {
@@ -166,13 +163,13 @@ async def _check_or_create_drycc_token(drycc_token, token):
             if drycc_token:
                 headers = {"Authorization": f"Token {drycc_token}"}
                 resp = await client.get(
-                    f"{DRYCC_CONTROLLER_API_URL}/v2/auth/whoami", headers=headers)
+                    f"{DRYCC_CONTROLLER_URL}/v2/auth/whoami", headers=headers)
                 if resp.status_code in [401, 403]:
                     created = True
             if created:
                 headers = {"Authorization": f"Bearer {token["access_token"]}"}
                 data = (await client.post(
-                    f"{DRYCC_CONTROLLER_API_URL}/v2/auth/token/?alias=grafana-datasource",
+                    f"{DRYCC_CONTROLLER_URL}/v2/auth/token/?alias=grafana-datasource",
                     headers=headers, json=token)).json()
                 drycc_token = data["token"]
             return created, drycc_token