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>
scroll-tech · Oct 31, 2024 · 534f1be · 534f1be
1 parent 3c6e315
commit 534f1be
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \