From 3f94def62401bd2b0a2406d9bae0d6302ec35001 Mon Sep 17 00:00:00 2001
From: irteam su-account <irteamsu@hpca-dns-g1901.svr.toastmaker.net>
Date: Thu, 26 Jun 2025 15:02:03 +0900
Subject: [PATCH] commit

---
 gpulive/grafana/base/grafana/cm.yaml          | 10 +++++++--
 gpulive/prometheus/ingress_alertmanager.yaml  | 22 +++++++++++++++++++
 gpulive/prometheus/ingress_prometheus.yaml    | 22 +++++++++++++++++++
 .../patch-ingress_alertmanager.yaml           |  6 ++---
 .../prometheus/patch-ingress_prometheus.yaml  |  6 ++---
 gpulive/sample_pod/tf-jupyter-notebook.yaml   |  2 +-
 6 files changed, 59 insertions(+), 9 deletions(-)
 create mode 100644 gpulive/prometheus/ingress_alertmanager.yaml
 create mode 100644 gpulive/prometheus/ingress_prometheus.yaml

diff --git a/gpulive/grafana/base/grafana/cm.yaml b/gpulive/grafana/base/grafana/cm.yaml
index b787a2f..3e8d8c8 100644
--- a/gpulive/grafana/base/grafana/cm.yaml
+++ b/gpulive/grafana/base/grafana/cm.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: grafana
-  namespace: monitoring
+  namespace: grafana
   labels:
     helm.sh/chart: grafana-8.10.0
     app.kubernetes.io/name: grafana
@@ -24,4 +24,10 @@ data:
     plugins = /var/lib/grafana/plugins
     provisioning = /etc/grafana/provisioning
     [server]
-    domain = ''
\ No newline at end of file
+    domain = ''
+    [theme]
+    default_them = light
+    [auth.anonymous]
+    enabled = true
+    org_name = Main Org.
+    org_role = Viewer
diff --git a/gpulive/prometheus/ingress_alertmanager.yaml b/gpulive/prometheus/ingress_alertmanager.yaml
new file mode 100644
index 0000000..e11d769
--- /dev/null
+++ b/gpulive/prometheus/ingress_alertmanager.yaml
@@ -0,0 +1,22 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: prometheus-alertmanager-ingress
+  namespace: monitoring
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: alert.gpulive.nhncloud.com
+    http:
+      paths:
+      - backend:
+          service:
+            name: prometheus-alertmanager
+            port:
+              number: 9093
+        path: /
+        pathType: Prefix
+  tls:
+  - hosts:
+    - alert.gpulive.nhncloud.com
+    secretName: gpulive-new-ssl
diff --git a/gpulive/prometheus/ingress_prometheus.yaml b/gpulive/prometheus/ingress_prometheus.yaml
new file mode 100644
index 0000000..1137f9b
--- /dev/null
+++ b/gpulive/prometheus/ingress_prometheus.yaml
@@ -0,0 +1,22 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: prometheus-ingress
+  namespace: monitoring
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: prometheus.gpulive.nhncloud.com
+    http:
+      paths:
+      - backend:
+          service:
+            name: prometheus-server
+            port:
+              number: 80
+        path: /
+        pathType: Prefix
+  tls:
+  - hosts:
+    - prometheus.gpulive.nhncloud.com
+    secretName: gpulive-new-ssl
diff --git a/gpulive/prometheus/overlays/vm/prometheus/patch-ingress_alertmanager.yaml b/gpulive/prometheus/overlays/vm/prometheus/patch-ingress_alertmanager.yaml
index b2df5e5..e11d769 100644
--- a/gpulive/prometheus/overlays/vm/prometheus/patch-ingress_alertmanager.yaml
+++ b/gpulive/prometheus/overlays/vm/prometheus/patch-ingress_alertmanager.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: alert.nhngpuaas.com
+  - host: alert.gpulive.nhncloud.com
     http:
       paths:
       - backend:
@@ -18,5 +18,5 @@ spec:
         pathType: Prefix
   tls:
   - hosts:
-    - alert.nhngpuaas.com
-    secretName: nhngpuaas-ssl
+    - alert.gpulive.nhncloud.com
+    secretName: gpulive-new-ssl
diff --git a/gpulive/prometheus/overlays/vm/prometheus/patch-ingress_prometheus.yaml b/gpulive/prometheus/overlays/vm/prometheus/patch-ingress_prometheus.yaml
index c03f487..1137f9b 100644
--- a/gpulive/prometheus/overlays/vm/prometheus/patch-ingress_prometheus.yaml
+++ b/gpulive/prometheus/overlays/vm/prometheus/patch-ingress_prometheus.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: prometheus.nhngpuaas.com
+  - host: prometheus.gpulive.nhncloud.com
     http:
       paths:
       - backend:
@@ -18,5 +18,5 @@ spec:
         pathType: Prefix
   tls:
   - hosts:
-    - prometheus.nhngpuaas.com
-    secretName: nhngpuaas-ssl
+    - prometheus.gpulive.nhncloud.com
+    secretName: gpulive-new-ssl
diff --git a/gpulive/sample_pod/tf-jupyter-notebook.yaml b/gpulive/sample_pod/tf-jupyter-notebook.yaml
index 4f7ff1a..79587a9 100644
--- a/gpulive/sample_pod/tf-jupyter-notebook.yaml
+++ b/gpulive/sample_pod/tf-jupyter-notebook.yaml
@@ -8,7 +8,7 @@ spec:
   resources:
     requests:
       storage: 1Gi
-  storageClassName: nfs-client
+  storageClassName: user-nas
 ---
 apiVersion: v1
 kind: Service