publish: v0.1.6

Author: plan9better

Makefile

@@ -1,4 +1,4 @@
-VERSION ?= 0.1.5
+VERSION ?= 0.1.6
 DOCKERHUB_USER ?= plan9better
 LOCAL_REGISTRY ?= 192.168.10.201:5000
 

cmd/manager/collector.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"os"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -41,27 +42,27 @@ func NewManagerCollector(network string, id int) *ManagerCollector {
 		BytesIn: prometheus.NewDesc(
 			ns+"_bytes_in",
 			"Number of bytes received on the interface",
-			[]string{"interface"}, nil,
+			[]string{"interface", "type", "id"}, nil,
 		),
 		BytesOut: prometheus.NewDesc(
 			ns+"_bytes_out",
 			"Number of bytes sent on the interface",
-			[]string{"interface"}, nil,
+			[]string{"interface", "type", "id"}, nil,
 		),
 		PacketsIn: prometheus.NewDesc(
 			ns+"_packets_in",
 			"Number of packets received on the interface",
-			[]string{"interface"}, nil,
+			[]string{"interface", "type", "id"}, nil,
 		),
 		PacketsOut: prometheus.NewDesc(
 			ns+"_packets_out",
 			"Number of packets sent on the interface",
-			[]string{"interface"}, nil,
+			[]string{"interface", "type", "id"}, nil,
 		),
 		InterfaceState: prometheus.NewDesc(
 			ns+"_interface_state",
 			"State of the interface, value of 1 means 'up'",
-			[]string{"interface", "state"}, nil,
+			[]string{"interface", "state", "type", "id"}, nil,
 		),
 	}
 	prometheus.MustRegister(mc)
@@ -99,44 +100,45 @@ func (mc *ManagerCollector) Collect(ch chan<- prometheus.Metric) {
 }
 
 func (mc *ManagerCollector) collectDevInfo(dev procfs.NetDevLine, ch chan<- prometheus.Metric) {
+	vlanID := os.Getenv("VLAN_ID")
+	link, err := netlink.LinkByName(dev.Name)
+	if err != nil {
+		klog.V(4).Infof("Error finding link '%s' by name: %s", dev.Name, err.Error())
+		return
+	}
+	stateValue := 0.0
+	if link.Attrs().OperState.String() == "up" {
+		stateValue = 1.0
+	}
 	ch <- prometheus.MustNewConstMetric(
 		mc.BytesIn,
 		prometheus.GaugeValue,
 		float64(dev.RxBytes),
-		dev.Name,
+		dev.Name, link.Type(), vlanID,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		mc.BytesOut,
 		prometheus.GaugeValue,
 		float64(dev.TxBytes),
-		dev.Name,
+		dev.Name, link.Type(), vlanID,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		mc.PacketsIn,
 		prometheus.GaugeValue,
 		float64(dev.RxPackets),
-		dev.Name,
+		dev.Name, link.Type(), vlanID,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		mc.PacketsOut,
 		prometheus.GaugeValue,
 		float64(dev.TxPackets),
-		dev.Name,
+		dev.Name, link.Type(), vlanID,
 	)
-	link, err := netlink.LinkByName(dev.Name)
-	if err != nil {
-		klog.V(4).Infof("Error finding link '%s' by name: %s", dev.Name, err.Error())
-		return
-	}
-	stateValue := 0.0
-	if link.Attrs().OperState.String() == "up" {
-		stateValue = 1.0
-	}
 	ch <- prometheus.MustNewConstMetric(
 		mc.InterfaceState,
 		prometheus.GaugeValue,
 		stateValue,
-		dev.Name, link.Attrs().OperState.String(),
+		dev.Name, link.Attrs().OperState.String(), link.Type(), vlanID,
 	)
 }
 

cmd/manager/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"flag"
@@ -127,7 +128,7 @@ func macvlan(w http.ResponseWriter, r *http.Request) {
 	}
 
 	cmd := exec.Command("bash", "-c", fmt.Sprintf("lsns | grep %d | awk '{print $4}'", mvr.NsID))
-	PID, err := cmd.Output()
+	PIDs, err := cmd.Output()
 	if err != nil {
 		exErr, ok := err.(*exec.ExitError)
 		if !ok {
@@ -137,6 +138,12 @@ func macvlan(w http.ResponseWriter, r *http.Request) {
 		writeError(fmt.Sprintf("Error checking PID of NsID: %s", string(exErr.Stderr)), exErr)
 		return
 	}
+	var PID string
+	if idx := bytes.IndexByte(PIDs, '\n'); idx >= 0 {
+		PID = string(PIDs[:idx])
+	} else {
+		PID = strings.TrimSpace(string(PIDs))
+	}
 
 	cmd = exec.Command("ip", "link", "set", attrs.Name, "netns", strings.TrimSpace(string(PID)))
 	out, err = cmd.Output()

flake.nix

@@ -125,7 +125,6 @@
               mkdir -p final/templates
               cat $src/values.yaml > final/values.yaml
               cat $src/Chart.yaml > final/Chart.yaml
-              cp $src/vlanman-*.tgz final/
 
               cp -aL ${manifests}/. final/templates/
 
@@ -134,7 +133,11 @@
 
               export VERSION=${version}
               perl -pi -e 's|(image:\s*")[^/]+/([^:"]+):[^"]+|\1$ENV{REGISTRY}/\2:$ENV{VERSION}|' final/values.yaml
-              perl -pi -e 's/pullPolicy:\s*Always/pullPolicy: IfNotPresent/g' final/values.yaml
+              ${
+                if version == "dev"
+                then "#"
+                else ""
+              } perl -pi -e 's/pullPolicy:\s*Always/pullPolicy: IfNotPresent/g' final/values.yaml
 
               # version
               yq '.version="${
@@ -204,7 +207,7 @@
             EDITOR = "hx";
           };
         };
-        version = "0.1.5";
+        version = "0.1.6";
       }
     );
 }

index.yaml

@@ -14,7 +14,28 @@ entries:
           - https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
       apiVersion: v2
       appVersion: 1.16.0
-      created: "2025-08-07T15:56:41.935689+02:00"
+      created: "2025-08-12T17:42:57.813356+02:00"
+      description: VLAN network manager
+      digest: 9ccfc3f1289aea3cc81b1f6a973b8ee5071f5ed6079339c71837ad79575d607d
+      name: vlanman
+      type: application
+      urls:
+        - https://github.com/dialohq/vlanman/releases/download/v0.1.6/vlanman-0.1.6.tgz
+      version: 0.1.6
+    - annotations:
+        artifacthub.io/category: networking
+        artifacthub.io/crds: |
+          - kind: VlanNetwork
+            version: v1
+            name: vlannetwork
+            description: Defines the VLAN connection
+        artifacthub.io/license: MIT
+        artifacthub.io/recommendations: |
+          - https://artifacthub.io/packages/helm/cert-manager/cert-manager
+          - https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
+      apiVersion: v2
+      appVersion: 1.16.0
+      created: "2025-08-12T17:42:57.812843+02:00"
       description: VLAN network manager
       digest: 34a50a6a95d7c171f597cff2afb786b8149ecb11b05d199f1c93034dcd7309cf
       name: vlanman
@@ -35,7 +56,7 @@ entries:
           - https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
       apiVersion: v2
       appVersion: 1.16.0
-      created: "2025-08-07T15:56:41.933775+02:00"
+      created: "2025-08-12T17:42:57.810188+02:00"
       description: VLAN network manager
       digest: 7555c142d6f65eb7a52d0135685b6bbe32407f0e69c6e113b580a467eb259a30
       name: vlanman
@@ -56,7 +77,7 @@ entries:
           - https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
       apiVersion: v2
       appVersion: 1.16.0
-      created: "2025-08-07T15:56:41.931348+02:00"
+      created: "2025-08-12T17:42:57.807963+02:00"
       description: VLAN network manager
       digest: 8e2efb5c505d6b963b74e704eaf96ee4cabae4a6fe2317d4dd8c494fa6013b8e
       name: vlanman
@@ -77,7 +98,7 @@ entries:
           - https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
       apiVersion: v2
       appVersion: 1.16.0
-      created: "2025-08-07T15:56:41.929552+02:00"
+      created: "2025-08-12T17:42:57.806468+02:00"
       description: VLAN network manager
       digest: 4a4c3b41a49039bb06b13221dc5a42973813e546a51a362cdf6f693c07fb90b4
       name: vlanman
@@ -98,7 +119,7 @@ entries:
           - https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
       apiVersion: v2
       appVersion: 1.16.0
-      created: "2025-08-07T15:56:41.928333+02:00"
+      created: "2025-08-12T17:42:57.805445+02:00"
       description: VLAN network manager
       digest: ab1060ee1c74386328a1913148b305e245a4dcbeea28cc8fb1cf4945f00c330d
       name: vlanman
@@ -119,12 +140,12 @@ entries:
           - https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
       apiVersion: v2
       appVersion: 1.16.0
-      created: "2025-08-07T15:56:41.927378+02:00"
+      created: "2025-08-12T17:42:57.805072+02:00"
       description: VLAN network manager
       digest: 0bf004ba2202856151915191f652966b1850352072d0af9a83fddf53e96aaa57
       name: vlanman
       type: application
       urls:
         - https://github.com/dialohq/vlanman/releases/download/v0.1.0/vlanman-0.1.0.tgz
       version: 0.1.0
-generated: "2025-08-07T15:56:41.92634+02:00"
+generated: "2025-08-12T17:42:57.804229+02:00"