From 534f1bed27780bcb3a6a75d80ca4e84f9983974d Mon Sep 17 00:00:00 2001
From: "shu@unifra" <shu@unifra.io>
Date: Thu, 31 Oct 2024 16:40:54 +0900
Subject: [PATCH] set default namespace and disable loki (#212)

* set default namespace to 'default' for dashboard Kubernetes / Views / Pods

* disable loki

* prometheus chart should installed first

* bump version

---------

Co-authored-by: Morty <yiweichi1@gmail.com>
---
 charts/scroll-monitor/Chart.yaml                       |  2 +-
 .../grafana/kubernetes-dashboards/k8s-views-pods.json  |  6 +++---
 charts/scroll-monitor/values.yaml                      |  2 +-
 charts/scroll-sdk/Chart.yaml                           |  4 ++--
 charts/scroll-sdk/values.yaml                          |  2 +-
 devnet/Makefile                                        |  2 +-
 examples/Makefile.example                              | 10 +++++-----
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/charts/scroll-monitor/Chart.yaml b/charts/scroll-monitor/Chart.yaml
index 28ba3c29..e6112f7c 100644
--- a/charts/scroll-monitor/Chart.yaml
+++ b/charts/scroll-monitor/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: helm chart to deploy grafana, prometheus and loki to monitor scroll-sdk
 name: scroll-monitor
-version: 0.0.6
+version: 0.0.7
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:
diff --git a/charts/scroll-monitor/grafana/kubernetes-dashboards/k8s-views-pods.json b/charts/scroll-monitor/grafana/kubernetes-dashboards/k8s-views-pods.json
index e3bf3f3f..e2909148 100644
--- a/charts/scroll-monitor/grafana/kubernetes-dashboards/k8s-views-pods.json
+++ b/charts/scroll-monitor/grafana/kubernetes-dashboards/k8s-views-pods.json
@@ -2572,9 +2572,9 @@
       },
       {
         "current": {
-          "selected": false,
-          "text": "monitoring",
-          "value": "monitoring"
+          "selected": true,
+          "text": "default",
+          "value": "default"
         },
         "datasource": {
           "type": "prometheus",
diff --git a/charts/scroll-monitor/values.yaml b/charts/scroll-monitor/values.yaml
index 84c3702a..6c45fa44 100644
--- a/charts/scroll-monitor/values.yaml
+++ b/charts/scroll-monitor/values.yaml
@@ -53,7 +53,7 @@ grafana:
       - "grafana.scrollsdk"
 
 loki:
-  enabled: true
+  enabled: false
   fullnameOverride: loki
   deploymentMode: SingleBinary
   persistence:
diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml
index 2c64f207..5ca8833e 100644
--- a/charts/scroll-sdk/Chart.yaml
+++ b/charts/scroll-sdk/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: scroll helm charts to deploy scroll sdk
 name: scroll-sdk
-version: 0.0.57
+version: 0.0.58
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:
@@ -98,7 +98,7 @@ dependencies:
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: scroll-common.enabled
   - name: scroll-monitor
-    version: 0.0.6
+    version: 0.0.7
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: scroll-monitor.enabled
   - name: admin-system-backend
diff --git a/charts/scroll-sdk/values.yaml b/charts/scroll-sdk/values.yaml
index 5777dbce..68b1cbbd 100644
--- a/charts/scroll-sdk/values.yaml
+++ b/charts/scroll-sdk/values.yaml
@@ -136,7 +136,7 @@ scroll-monitor:
       hosts:
         - grafana.scrollsdk
   loki:
-    enabled: true
+    enabled: false
   promtail:
     enabled: true
   kube-prometheus-stack:
diff --git a/devnet/Makefile b/devnet/Makefile
index 61709264..b67e88b9 100644
--- a/devnet/Makefile
+++ b/devnet/Makefile
@@ -7,7 +7,7 @@ L1_RPC_HOST := l1-devnet.scrollsdk
 
 bootstrap:
 		echo "Pulling helm chart..."
-		helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.0.57
+		helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.0.58
 		echo "Extracting helm chart..."
 		tar -xvf *.tgz
 		$(MAKE) config
diff --git a/examples/Makefile.example b/examples/Makefile.example
index e898aba2..7f3cac97 100644
--- a/examples/Makefile.example
+++ b/examples/Makefile.example
@@ -1,6 +1,11 @@
 NAMESPACE ?= default
 
 install:
+	helm upgrade -i scroll-monitor oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-monitor -n $(NAMESPACE) \
+		--version=0.0.4 \
+		--values values/scroll-monitor-production.yaml \
+		--values values/alert-manager.yaml
+
 	helm upgrade -i scroll-common oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-common -n $(NAMESPACE) \
 		--version=0.0.4 \
 		--values values/genesis.yaml
@@ -90,11 +95,6 @@ install:
 		--values values/scroll-common-config-contracts.yaml \
 		--values values/scroll-common-config.yaml
 
-	helm upgrade -i scroll-monitor oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-monitor -n $(NAMESPACE) \
-		--version=0.0.4 \
-		--values values/scroll-monitor-production.yaml \
-		--values values/alert-manager.yaml
-
 	helm upgrade -i balance-checker oci://ghcr.io/scroll-tech/scroll-sdk/helm/balance-checker -n $(NAMESPACE) \
 		--version=0.0.4 \
 		--values values/balance-checker-production.yaml \