fix: moved test to ci

NetApp · Sep 19, 2024 · 805cdfe · 805cdfe
1 parent 23c18c0
commit 805cdfe
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 37 deletions.
diff --git a/cmd/collectors/commonutils.go b/cmd/collectors/commonutils.go
@@ -9,7 +9,6 @@ import (
 	"github.com/netapp/harvest/v2/pkg/util"
 	"github.com/tidwall/gjson"
 	"os"
-	"regexp"
 	"sort"
 	"strconv"
 	"strings"
@@ -21,8 +20,6 @@ const (
 	MaxAllowedTimeDrift = 10 * time.Second
 )
 
-var isStringAlphabetic = regexp.MustCompile(`^[a-zA-Z0-9_]*$`).MatchString
-
 var validUnits = map[string]bool{
 	"mW":    true,
 	"W":     true,
@@ -517,31 +514,3 @@ func PopulateIfgroupMetrics(portIfgroupMap map[string]string, portDataMap map[st
 	}
 	return nil
 }
-
-func FindStringBetweenTwoChar(stringValue string, startChar string, endChar string) []string {
-	var counters = make([]string, 0)
-	firstSet := strings.Split(stringValue, startChar)
-	for _, actualString := range firstSet {
-		counterArray := strings.Split(actualString, endChar)
-		switch {
-		case strings.Contains(actualString, ")"): // check for inner expression such as top:
-			counterArray = strings.Split(actualString, ")")
-		case strings.Contains(actualString, "+"): // check for inner expression such as top:
-			counterArray = strings.Split(actualString, "+")
-		case strings.Contains(actualString, "/"): // check for inner expression such as top:
-			counterArray = strings.Split(actualString, "/")
-		case strings.Contains(actualString, ","): // check for inner expression such as top:
-			counterArray = strings.Split(actualString, ",")
-		}
-		counter := strings.TrimSpace(counterArray[len(counterArray)-1])
-		counterArray = strings.Split(counter, endChar)
-		counter = strings.TrimSpace(counterArray[len(counterArray)-1])
-		if _, err := strconv.Atoi(counter); err == nil {
-			continue
-		}
-		if isStringAlphabetic(counter) && counter != "" {
-			counters = append(counters, counter)
-		}
-	}
-	return counters
-}
diff --git a/cmd/tools/generate/generate.go b/cmd/tools/generate/generate.go
@@ -676,11 +676,11 @@ func init() {
 	fFlags := fullCmd.PersistentFlags()
 
 	flags := metricCmd.PersistentFlags()
-	flags.StringVarP(&opts.Poller, "poller", "p", "sar", "name of poller, e.g. 10.193.48.154")
+	flags.StringVarP(&opts.Poller, "poller", "p", "dc1", "name of poller, e.g. 10.193.48.154")
 	_ = metricCmd.MarkPersistentFlagRequired("poller")
 
 	flag := descCmd.PersistentFlags()
-	flag.StringVarP(&opts.Poller, "poller", "p", "sar", "name of poller, e.g. 10.193.48.154")
+	flag.StringVarP(&opts.Poller, "poller", "p", "dc1", "name of poller, e.g. 10.193.48.154")
 	_ = descCmd.MarkPersistentFlagRequired("poller")
 
 	dFlags.IntVarP(&opts.loglevel, "loglevel", "l", 2,

diff --git a/cmd/collectors/alert_rule_test.go → integration/test/alert_rule_test.go b/cmd/collectors/alert_rule_test.go → integration/test/alert_rule_test.go
@@ -1,7 +1,8 @@
-package collectors
+package main
 
 import (
 	"fmt"
+	"github.com/Netapp/harvest-automation/test/utils"
 	"github.com/netapp/harvest/v2/cmd/tools/generate"
 	"github.com/netapp/harvest/v2/pkg/tree"
 	"github.com/netapp/harvest/v2/pkg/tree/node"
@@ -29,6 +30,7 @@ var exceptionMetrics = []string{
 }
 
 func TestAlertRules(t *testing.T) {
+	utils.SkipIfMissing(t, utils.Regression)
 	metrics, _ := generate.GeneratedMetrics("../../", "harvest.yml", "dc1")
 	for pluginMetric, pluginLabels := range pluginGeneratedMetric {
 		metrics[pluginMetric] = generate.Counter{Name: pluginMetric, Labels: pluginLabels}
@@ -57,6 +59,7 @@ func TestAlertRules(t *testing.T) {
 }
 
 func TestEmsAlertRules(t *testing.T) {
+	utils.SkipIfMissing(t, utils.Regression)
 	templateEmsLabels := getEmsLabels("../../conf/ems/9.6.0/ems.yaml")
 	emsAlertRules := GetAllAlertRules("../../container/prometheus/", "ems_alert_rules.yml", true)
 	for _, alertRule := range emsAlertRules {

diff --git a/integration/test/dashboard_json_test.go b/integration/test/dashboard_json_test.go
@@ -4,13 +4,14 @@ import (
 	"fmt"
 	"github.com/Netapp/harvest-automation/test/dashboard"
 	"github.com/Netapp/harvest-automation/test/utils"
-	"github.com/netapp/harvest/v2/cmd/collectors"
 	"github.com/tidwall/gjson"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 	"log/slog"
 	"os"
 	"path/filepath"
+	"regexp"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -23,6 +24,8 @@ const (
 
 var restDataCollectors = []string{"Rest"}
 
+var isStringAlphabetic = regexp.MustCompile(`^[a-zA-Z0-9_]*$`).MatchString
+
 var fileSet []string
 
 // zapiCounterMap are additional counters, above and beyond the ones from counterMap, which should be excluded from Zapi
@@ -340,7 +343,7 @@ func getAllExpr(record gjson.Result) []string {
 }
 
 func getAllCounters(expression string) []string {
-	all := collectors.FindStringBetweenTwoChar(expression, "{", "(")
+	all := FindStringBetweenTwoChar(expression, "{", "(")
 	var filtered []string
 
 allLoop:
@@ -361,7 +364,7 @@ allLoop:
 
 func validateExpr(expression string) (bool, string) {
 	if expression != "" {
-		counters := collectors.FindStringBetweenTwoChar(expression, "{", "(")
+		counters := FindStringBetweenTwoChar(expression, "{", "(")
 		newExpression := expression
 		if len(counters) > 0 {
 			for _, counter := range counters {
@@ -395,6 +398,34 @@ func GetAllJsons(dir string) []string {
 	return fileSet
 }
 
+func FindStringBetweenTwoChar(stringValue string, startChar string, endChar string) []string {
+	var counters = make([]string, 0)
+	firstSet := strings.Split(stringValue, startChar)
+	for _, actualString := range firstSet {
+		counterArray := strings.Split(actualString, endChar)
+		switch {
+		case strings.Contains(actualString, ")"): // check for inner expression such as top:
+			counterArray = strings.Split(actualString, ")")
+		case strings.Contains(actualString, "+"): // check for inner expression such as top:
+			counterArray = strings.Split(actualString, "+")
+		case strings.Contains(actualString, "/"): // check for inner expression such as top:
+			counterArray = strings.Split(actualString, "/")
+		case strings.Contains(actualString, ","): // check for inner expression such as top:
+			counterArray = strings.Split(actualString, ",")
+		}
+		counter := strings.TrimSpace(counterArray[len(counterArray)-1])
+		counterArray = strings.Split(counter, endChar)
+		counter = strings.TrimSpace(counterArray[len(counterArray)-1])
+		if _, err := strconv.Atoi(counter); err == nil {
+			continue
+		}
+		if isStringAlphabetic(counter) && counter != "" {
+			counters = append(counters, counter)
+		}
+	}
+	return counters
+}
+
 func hasDataInDB(query string, waitFor time.Duration) bool {
 	now := time.Now()
 	for {