fix: remove threshold from quota rest template (#3093)

* fix: remove threshold from quota rest template * fix: handled threshold metric in quota plugin * fix: handled review comment * refactor: remove stack trace --------- Co-authored-by: Chris Grindstaff <[email protected]>
NetApp · Aug 8, 2024 · 4e3945c · 4e3945c
1 parent 0d2d7b4
commit 4e3945c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/cmd/collectors/rest/plugins/quota/quota.go b/cmd/collectors/rest/plugins/quota/quota.go
@@ -16,6 +16,10 @@ func New(p *plugin.AbstractPlugin) plugin.Plugin {
 }
 
 func (q *Quota) Init() error {
+	if err := q.InitAbc(); err != nil {
+		return err
+	}
+
 	if q.Params.HasChildS("qtreeMetrics") {
 		q.qtreeMetrics = true
 	}
@@ -25,6 +29,14 @@ func (q *Quota) Init() error {
 func (q *Quota) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, *util.Metadata, error) {
 	data := dataMap[q.Object]
 
+	// The threshold metric does not exist in REST quota template, we are adding it to maintain parity with exported ZAPI metrics
+	if data.GetMetric("threshold") == nil {
+		_, err := data.NewMetricFloat64("threshold", "threshold")
+		if err != nil {
+			q.Logger.Error().Err(err).Msg("add metric")
+		}
+	}
+
 	// Purge and reset data
 	instanceMap := data.GetInstances()
 	metricsMap := data.GetMetrics()

diff --git a/conf/rest/9.12.0/quota.yaml b/conf/rest/9.12.0/quota.yaml
@@ -23,7 +23,6 @@ counters:
   - space.used.hard_limit_percent => disk_used_pct_disk_limit
   - space.used.soft_limit_percent => disk_used_pct_soft_disk_limit
   - space.used.total              => disk_used
-  - threshold                     => threshold
   - filter:
       - show_default_records=false
       - type=tree #|user|group