adapt to metal-api v0.35.2 (#16)

.github/workflows/docker.yaml

@@ -22,23 +22,23 @@ jobs:
 
     steps:
     - name: Log in to the container registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ secrets.DOCKER_REGISTRY_USER }}
         password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version-file: 'go.mod'
         cache: false
 
     - name: Lint
-      uses: golangci/golangci-lint-action@v3
+      uses: golangci/golangci-lint-action@v6
       with:
         args: --build-tags integration -p bugs -p unused --timeout=5m
 
@@ -53,7 +53,7 @@ jobs:
         make all
 
     - name: Push image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v6
       with:
         context: .
         push: true

.github/workflows/release-drafter.yaml

@@ -10,6 +10,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: release-drafter/release-drafter@v5
+    - uses: release-drafter/release-drafter@v6
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -29,21 +29,49 @@ metal_network_prefix_available{networkId="020966ab-18da-40d6-ba69-fea8d60e6074"}
 # TYPE metal_network_prefix_used gauge
 metal_network_prefix_used{networkId="020966ab-18da-40d6-ba69-fea8d60e6074"} 0
 
+# HELP metal_partition_capacity_allocatable The total number of waiting allocatable machines in the partition
+# TYPE metal_partition_capacity_allocatable gauge
+metal_partition_capacity_allocatable{partition="fra-equ01",size="c1-xlarge-x86"} 2
+
 # HELP metal_partition_capacity_allocated The capacity of allocated machines in the partition
 # TYPE metal_partition_capacity_allocated gauge
-metal_partition_capacity_allocated{partition="fel-wps101",size="c1-xlarge-x86"} 148
+metal_partition_capacity_allocated{partition="fra-equ01",size="c1-xlarge-x86"} 1
 
 # HELP metal_partition_capacity_faulty The capacity of faulty machines in the partition
 # TYPE metal_partition_capacity_faulty gauge
-metal_partition_capacity_faulty{partition="fel-wps101",size="c1-xlarge-x86"} 2
+metal_partition_capacity_faulty{partition="fra-equ01",size="c1-xlarge-x86"} 0
 
-# HELP metal_partition_capacity_free The capacity of free machines in the partition
+# HELP metal_partition_capacity_free (DEPRECATED) The total number of allocatable machines in the partition, use metal_partition_capacity_allocatable
 # TYPE metal_partition_capacity_free gauge
-metal_partition_capacity_free{partition="fel-wps101",size="c1-xlarge-x86"} 5
+metal_partition_capacity_free{partition="fra-equ01",size="c1-xlarge-x86"} 2
+
+# HELP metal_partition_capacity_other The total number of machines in an other state in the partition
+# TYPE metal_partition_capacity_other gauge
+metal_partition_capacity_other{partition="fra-equ01",size="c1-xlarge-x86"} 0
+
+# HELP metal_partition_capacity_phoned_home The total number of faulty machines in the partition
+# TYPE metal_partition_capacity_phoned_home gauge
+metal_partition_capacity_phoned_home{partition="fra-equ01",size="c1-xlarge-x86"} 1
+
+# HELP metal_partition_capacity_reservations_total The sum of capacity reservations in the partition
+# TYPE metal_partition_capacity_reservations_total gauge
+metal_partition_capacity_reservations_total{partition="fra-equ01",size="c1-xlarge-x86"} 1
 
-# HELP metal_partition_capacity_total The total capacity of machines in the partition
+# HELP metal_partition_capacity_reservations_used The sum of used capacity reservations in the partition
+# TYPE metal_partition_capacity_reservations_used gauge
+metal_partition_capacity_reservations_used{partition="fra-equ01",size="c1-xlarge-x86"} 0
+
+# HELP metal_partition_capacity_total The total number of machines in the partition
 # TYPE metal_partition_capacity_total gauge
-metal_partition_capacity_total{partition="fel-wps101",size="c1-xlarge-x86"} 159
+metal_partition_capacity_total{partition="fra-equ01",size="c1-xlarge-x86"} 3
+
+# HELP metal_partition_capacity_unavailable The total number of faulty machines in the partition
+# TYPE metal_partition_capacity_unavailable gauge
+metal_partition_capacity_unavailable{partition="fra-equ01",size="c1-xlarge-x86"} 0
+
+# HELP metal_partition_capacity_waiting The total number of waiting machines in the partition
+# TYPE metal_partition_capacity_waiting gauge
+metal_partition_capacity_waiting{partition="fra-equ01",size="c1-xlarge-x86"} 2
 
 # HELP metal_switch_sync_durations The duration of the syncs
 # TYPE metal_switch_sync_durations gauge

go.mod

@@ -1,68 +1,64 @@
 module github.com/metal-stack/metal-metrics-exporter
 
-go 1.21
+go 1.23
 
 require (
-	github.com/metal-stack/metal-go v0.24.2
-	github.com/prometheus/client_golang v1.16.0
-	k8s.io/klog/v2 v2.100.1
+	github.com/metal-stack/metal-go v0.35.2
+	github.com/prometheus/client_golang v1.20.3
+	k8s.io/klog/v2 v2.130.1
 )
 
-require github.com/rogpeppe/go-internal v1.11.0 // indirect
-
 require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/coreos/go-oidc/v3 v3.6.0 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/coreos/go-oidc/v3 v3.11.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.4 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/analysis v0.21.4 // indirect
-	github.com/go-openapi/errors v0.20.4 // indirect
-	github.com/go-openapi/jsonpointer v0.20.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/loads v0.21.2 // indirect
-	github.com/go-openapi/runtime v0.26.0 // indirect
-	github.com/go-openapi/spec v0.20.9 // indirect
-	github.com/go-openapi/strfmt v0.21.7 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
-	github.com/go-openapi/validate v0.22.1 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/go-openapi/analysis v0.23.0 // indirect
+	github.com/go-openapi/errors v0.22.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/loads v0.22.0 // indirect
+	github.com/go-openapi/runtime v0.28.0 // indirect
+	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/go-openapi/strfmt v0.23.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/validate v0.24.0 // indirect
+	github.com/goccy/go-json v0.10.3 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/uuid v1.3.1 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
-	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/lestrrat-go/blackmagic v1.0.2 // indirect
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
+	github.com/lestrrat-go/httprc v1.0.6 // indirect
 	github.com/lestrrat-go/iter v1.0.2 // indirect
-	github.com/lestrrat-go/jwx v1.2.26 // indirect
+	github.com/lestrrat-go/jwx/v2 v2.1.1 // indirect
 	github.com/lestrrat-go/option v1.0.1 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/metal-stack/metal-lib v0.13.3
-	github.com/metal-stack/security v0.6.7 // indirect
+	github.com/metal-stack/metal-lib v0.18.2
+	github.com/metal-stack/security v0.8.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
-	go.mongodb.org/mongo-driver v1.12.1 // indirect
-	go.opentelemetry.io/otel v1.14.0 // indirect
-	go.opentelemetry.io/otel/trace v1.14.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.25.0 // indirect
-	golang.org/x/crypto v0.12.0 // indirect
-	golang.org/x/net v0.14.0 // indirect
-	golang.org/x/oauth2 v0.11.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.59.1 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/segmentio/asm v1.2.0 // indirect
+	go.mongodb.org/mongo-driver v1.16.1 // indirect
+	go.opentelemetry.io/otel v1.30.0 // indirect
+	go.opentelemetry.io/otel/metric v1.30.0 // indirect
+	go.opentelemetry.io/otel/trace v1.30.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )