Merge pull request #604 from AICoE/migrate-grafana

Migrate telemetry grafana prod to new cluster
AICoE · Feb 22, 2024 · d6923ef · d6923ef
2 parents 8b53e7f + 5a0e88e
commit d6923ef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/bootstrap/argocd/applications/dh-prod-telemetry-grafana.yaml b/bootstrap/argocd/applications/dh-prod-telemetry-grafana.yaml
@@ -6,8 +6,8 @@ metadata:
   namespace: internal-data-hub--argocd
 spec:
   destination:
-    namespace: dh-prod-telemetry-grafana
-    server: https://api.datahub-ocp4.prod.psi.redhat.com:6443
+    namespace: internal-data-hub--telemetry-grafana-prod
+    server: https://api.gpc.ocp-hub.prod.psi.redhat.com:6443
   project: internal-data-hub
   source:
     path: telemetry-grafana/overlays/prod
@@ -32,8 +32,8 @@ metadata:
   namespace: internal-data-hub--argocd
 spec:
   destination:
-    namespace: dh-prod-telemetry-grafana
-    server: https://api.datahub-ocp4.prod.psi.redhat.com:6443
+    namespace: internal-data-hub--telemetry-grafana-prod
+    server: https://api.gpc.ocp-hub.prod.psi.redhat.com:6443
   project: internal-data-hub
   source:
     path: overlays/prod

diff --git a/telemetry-grafana/overlays/prod/grafana-external-route.enc.yaml b/telemetry-grafana/overlays/prod/grafana-external-route.enc.yaml
@@ -2,6 +2,8 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
     name: grafana-external
+    labels:
+        shard: internal
 spec:
     host: telemeter-lts-dashboards.datahub.redhat.com
     to:
@@ -20,8 +22,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-05-16T16:56:00Z"
-    mac: ENC[AES256_GCM,data:4nUrKgh8LxqM3+G/rjXjxj89pBedmynV/Yjt+Y12txb6Map5mxGEZ0vZR5hIVslplF0a9zl45bp89u7461sIfG8dPJ3GUpPC1d7JYXFGOhhqzb+psYr7xyEmYwVG5RS1jlcAg6mZSM/lQhjQoeFg607ibaSQs6BKupuI/QtpApk=,iv:dOD4u96nvnikIX4PRybkvFFUOug9LUD+zUHKtdVF1/4=,tag:BjgbVWrOIwz6Val3diQxwA==,type:str]
+    lastmodified: "2024-02-22T13:33:27Z"
+    mac: ENC[AES256_GCM,data:KOjH4Pk6CKaKUEDWqk8AZgDZ65gFaEWy4HfFwu2UxR7FiKmAQozrxN4XbkX3fv+OgT5OXgIQ44k+VpMdRFQOTWvT5fLT4KhReUk62/Mr3dnvqjs77mCQ2fjhA4UMoNI6vQH4zRGGYhiiJWdUQtK+9gRhTXEYOibDiqiiul6z5iM=,iv:g9L6d+EccHCE/GuYEBxP9OuVoK+Fe4WYO9/x9Tblvfc=,tag:AYLfqsUDn4S88u8KGZ8IWw==,type:str]
     pgp:
         - created_at: "2021-10-04T17:07:21Z"
           enc: |
@@ -39,4 +41,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: EFDB9AFBD18936D9AB6B2EECBD2C73FF891FBC7E
     encrypted_regex: ^(data|stringData|tls)$
-    version: 3.7.1
+    version: 3.8.1
diff --git a/telemetry-grafana/overlays/prod/kustomization.yaml b/telemetry-grafana/overlays/prod/kustomization.yaml
@@ -8,7 +8,7 @@ resources:
 generators:
   - ./secret-generator.yaml
 
-namespace: dh-prod-telemetry-grafana
+namespace: internal-data-hub--telemetry-grafana-prod
 
 patchesJson6902:
   - target:
@@ -37,4 +37,4 @@ patchesJson6902:
     patch: |
       - op: add
         path: /spec/template/spec/containers/2/args/-
-        value: --openshift-sar={"namespace":"dh-prod-telemetry-grafana","resource":"services","resourceName":"grafana","verb":"get"}
+        value: --openshift-sar={"namespace":"internal-data-hub--telemetry-grafana-prod","resource":"services","resourceName":"grafana","verb":"get"}