Rename archives metric and update dashboard,linter

fission · Sep 19, 2022 · ed9de69 · ed9de69
1 parent 0fc0005
commit ed9de69
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/charts/fission-all/dashboards/.lint b/charts/fission-all/dashboards/.lint
@@ -8,6 +8,4 @@ exclusions:
   target-instance-rule:
     reason: "Most panels dont need to be filtered by instance"
   panel-units-rule:
-    reason: "Some panels are using the 'number' unit which throws a linting error."
-  target-counter-agg-rule:
-    reason: "disabled for fission_archives_total. This metric should be not have total due to naming conventions as its a gauge, not a counter"
+    reason: "Some panels are using the 'number' unit which throws a linting error."
diff --git a/charts/fission-all/dashboards/fission-admin-dashboard.json b/charts/fission-all/dashboards/fission-admin-dashboard.json
@@ -879,7 +879,7 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "fission_archives_total",
+          "expr": "fission_archives",
           "legendFormat": "Namespace: {{namespace}} Pod: {{pod}}",
           "range": true,
           "refId": "A"
@@ -970,7 +970,7 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "rate(fission_archives_total[$__rate_interval])",
+          "expr": "rate(fission_archives[$__rate_interval])",
           "legendFormat": "Namespace: {{namespace}} Pod: {{pod}}",
           "range": true,
           "refId": "A"

diff --git a/pkg/storagesvc/metrics.go b/pkg/storagesvc/metrics.go
@@ -9,7 +9,7 @@ var (
 	functionLabels = []string{}
 	totalArchives  = promauto.NewGaugeVec(
 		prometheus.GaugeOpts{
-			Name: "fission_archives_total",
+			Name: "fission_archives",
 			Help: "Number of archives stored",
 		},
 		functionLabels,