Merge pull request lxc#2104 from stgraber/main

Include OS metrics on Incus OS

Author: hallyn

cmd/incusd/api_metrics.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
 	"net"
 	"net/http"
 	"runtime"
@@ -22,6 +23,7 @@ import (
 	"github.com/lxc/incus/v6/internal/server/request"
 	"github.com/lxc/incus/v6/internal/server/response"
 	"github.com/lxc/incus/v6/internal/server/state"
+	internalutil "github.com/lxc/incus/v6/internal/util"
 	"github.com/lxc/incus/v6/shared/api"
 	"github.com/lxc/incus/v6/shared/logger"
 )
@@ -367,5 +369,28 @@ func internalMetrics(ctx context.Context, daemonStartTime time.Time, tx *db.Clus
 	out.AddSamples(metrics.GoStackSysBytes, metrics.Sample{Value: float64(ms.StackSys)})
 	out.AddSamples(metrics.GoSysBytes, metrics.Sample{Value: float64(ms.Sys)})
 
+	// If on Incus OS, include OS metrics.
+	if internalutil.IsIncusOS() {
+		client := http.Client{}
+		client.Transport = &http.Transport{
+			DialContext: func(_ context.Context, network, addr string) (net.Conn, error) {
+				return net.DialTimeout("tcp", "127.0.0.1:9100", 50*time.Millisecond)
+			},
+			DisableKeepAlives:     true,
+			ExpectContinueTimeout: time.Second * 3,
+			ResponseHeaderTimeout: time.Second * 3,
+		}
+
+		resp, err := client.Get("http://incus-os/metrics")
+		if err == nil {
+			defer resp.Body.Close()
+
+			osMetrics, err := io.ReadAll(resp.Body)
+			if err == nil {
+				out.AddRaw(osMetrics)
+			}
+		}
+	}
+
 	return out
 }

cmd/incusd/api_os.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/lxc/incus/v6/internal/server/auth"
 	"github.com/lxc/incus/v6/internal/server/response"
-	"github.com/lxc/incus/v6/shared/util"
+	internalutil "github.com/lxc/incus/v6/internal/util"
 )
 
 var apiOS = APIEndpoint{
@@ -24,7 +24,7 @@ var apiOS = APIEndpoint{
 
 func apiOSProxy(_ *Daemon, r *http.Request) response.Response {
 	// Check if this is an Incus OS system.
-	if !util.PathExists("/run/incus-os/unix.socket") {
+	if !internalutil.IsIncusOS() {
 		return response.BadRequest(errors.New("System isn't running Incus OS"))
 	}
 

internal/server/metrics/metrics.go

@@ -65,6 +65,11 @@ func (m *MetricSet) AddSamples(metricType MetricType, samples ...Sample) {
 	m.set[metricType] = append(m.set[metricType], samples...)
 }
 
+// AddRaw allows for adding extra metrics directly to the output without having to parse them first.
+func (m *MetricSet) AddRaw(rawData []byte) {
+	m.suffix = append(m.suffix, rawData...)
+}
+
 // Merge merges two MetricSets. Missing labels from m's samples are added to all samples in n.
 func (m *MetricSet) Merge(metricSet *MetricSet) {
 	if metricSet == nil {
@@ -84,6 +89,10 @@ func (m *MetricSet) Merge(metricSet *MetricSet) {
 			m.set[metricType] = append(m.set[metricType], sample)
 		}
 	}
+
+	if metricSet.suffix != nil {
+		m.suffix = append(m.suffix, metricSet.suffix...)
+	}
 }
 
 func (m *MetricSet) String() string {
@@ -158,7 +167,12 @@ func (m *MetricSet) String() string {
 		}
 	}
 
-	_, err := out.WriteString("# EOF\n")
+	_, err := out.Write(m.suffix)
+	if err != nil {
+		return ""
+	}
+
+	_, err = out.WriteString("# EOF\n")
 	if err != nil {
 		return ""
 	}

internal/server/metrics/types.go

@@ -10,6 +10,7 @@ type Sample struct {
 type MetricSet struct {
 	set    map[MetricType][]Sample
 	labels map[string]string
+	suffix []byte
 }
 
 // MetricType is a numeric code identifying the metric.

internal/util/os.go

@@ -0,0 +1,10 @@
+package util
+
+import (
+	"github.com/lxc/incus/v6/shared/util"
+)
+
+// IsIncusOS checks if the host system is running Incus OS.
+func IsIncusOS() bool {
+	return util.PathExists("/run/incus-os/unix.socket")
+}