Read alias from ptp4l config instead of socket

Author: nocturnalastro

plugins/ptp_operator/metrics/metrics.go

@@ -19,8 +19,6 @@ var (
 	// NodeName from the env
 	ptpNodeName        = ""
 	masterOffsetSource = ""
-
-	aliasRegex = regexp.MustCompile(`ALIAS:\s*(?P<interface>[\w|-|_]+)\s+->\s(?P<alias>[\w|-|_]+)`)
 )
 
 const (
@@ -92,12 +90,6 @@ func (p *PTPEventManager) ExtractMetrics(msg string) {
 			log.Errorf("failed to extract %s", msg)
 		}
 	}()
-
-	if match := aliasRegex.FindStringSubmatch(msg); len(match) >= 3 {
-		utils.Aliases.SetAlias(match[1], match[2])
-		return
-	}
-
 	replacer := strings.NewReplacer("[", " ", "]", " ", ":", " ")
 	output := replacer.Replace(msg)
 	fields := strings.Fields(output)

plugins/ptp_operator/metrics/metrics_test.go

@@ -171,7 +171,7 @@ func (tc *TestCase) cleanupMetrics() {
 	metrics.SyncState.With(map[string]string{"process": tc.process, "node": tc.node, "iface": tc.iface}).Set(CLEANUP)
 	metrics.NmeaStatus.With(map[string]string{"process": tc.process, "node": tc.node, "iface": tc.iface}).Set(CLEANUP)
 	metrics.ClockClassMetrics.With(map[string]string{"process": tc.process, "config": "ptp4l.0.config", "node": tc.node}).Set(CLEANUP)
-	metrics.InterfaceRole.With(map[string]string{"process": tc.process, "node": tc.node, "iface": tc.iface}).Set(CLEANUP)
+	metrics.InterfaceRole.With(map[string]string{"process": tc.process, "node": tc.node, "iface": tc.iface, "alias": tc.iface}).Set(CLEANUP)
 	ptpEventManager.ResetMockEvent()
 }
 
@@ -466,7 +466,7 @@ func Test_ExtractMetrics(t *testing.T) {
 		ptpEventManager.ExtractMetrics(tc.log)
 
 		if tc.expectedRoleCheck {
-			role := metrics.InterfaceRole.With(map[string]string{"process": tc.process, "node": tc.node, "iface": tc.iface})
+			role := metrics.InterfaceRole.With(map[string]string{"process": tc.process, "node": tc.node, "iface": tc.iface, "alias": tc.iface})
 			statsAddValue(tc.iface, int64(testutil.ToFloat64(role)), tc.logPtp4lConfigName)
 			value := types.PtpPortRole(testutil.ToFloat64(role))
 			assert.Equal(tc.expectedRole, value, "ptp role does not match\n%s", tc.String())

plugins/ptp_operator/metrics/registry.go

@@ -5,6 +5,7 @@ import (
 	"sync"
 
 	"github.com/redhat-cne/cloud-event-proxy/plugins/ptp_operator/stats"
+	"github.com/redhat-cne/cloud-event-proxy/plugins/ptp_operator/utils"
 
 	log "github.com/sirupsen/logrus"
 
@@ -85,7 +86,7 @@ var (
 			Subsystem: ptpSubsystem,
 			Name:      "interface_role",
 			Help:      "0 = PASSIVE, 1 = SLAVE, 2 = MASTER, 3 = FAULTY, 4 = UNKNOWN, 5 = LISTENING",
-		}, []string{"process", "node", "iface"})
+		}, []string{"process", "node", "iface", "alias"})
 
 	// ClockClassMetrics metrics to show current clock class for the node
 	ClockClassMetrics = prometheus.NewGaugeVec(
@@ -249,7 +250,7 @@ func UpdatePTPHaMetrics(profile string, status int64) {
 // UpdateInterfaceRoleMetrics ... update interface role metrics
 func UpdateInterfaceRoleMetrics(process, ptpInterface string, role types.PtpPortRole) {
 	InterfaceRole.With(prometheus.Labels{
-		"process": process, "node": ptpNodeName, "iface": ptpInterface}).Set(float64(role))
+		"process": process, "node": ptpNodeName, "iface": ptpInterface, "alias": utils.GetAlias(ptpInterface)}).Set(float64(role))
 }
 
 // DeleteInterfaceRoleMetrics ... delete interface role metrics

plugins/ptp_operator/ptp4lconf/ptp4lConfig.go

@@ -34,6 +34,7 @@ var (
 	ptpSyncE4lConfigFileRegEx = regexp.MustCompile(`synce4l.[0-9]*.config`)
 	sectionHead               = regexp.MustCompile(`\[([^\[\]]*)\]`)
 	profileRegEx              = regexp.MustCompile(`profile: \s*([\w-_]+)`)
+	aliasRegEx                = regexp.MustCompile(`#\s*alias:\s*(.*)\s*`)
 	fileNameRegEx             = regexp.MustCompile("([^/]+$)")
 )
 
@@ -101,7 +102,14 @@ func (p *PtpConfigUpdate) GetAllSections() map[string]map[string]string {
 		line := strings.TrimSpace(scanner.Text())
 
 		// Skip empty lines and comments
-		if line == "" || strings.HasPrefix(line, "#") {
+		if line == "" || (strings.HasPrefix(line, "#") && !aliasRegEx.MatchString(line)) {
+			continue
+		}
+
+		if match := aliasRegEx.FindStringSubmatch(line); len(match) >= 2 {
+			if match[1] != "" {
+				utils.Aliases.SetAlias(currentSection, match[1])
+			}
 			continue
 		}