Skip to content

Commit

Permalink
Add metrics to Globalnet 2.0
Browse files Browse the repository at this point in the history
Add 2 metrics to globalnet:
1. submariner_global_IP_availability
2. submariner_global_IP_allocated
Those metrics reffers to the global CIDR shared by all globalnet controllers

Partly Fix: #1471

Signed-off-by: Maayan Friedman <[email protected]>
  • Loading branch information
maayanf24 authored and sridhargaddam committed Dec 4, 2021
1 parent f40880e commit c23c889
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 3 deletions.
69 changes: 69 additions & 0 deletions pkg/globalnet/metrics/metrics.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
SPDX-License-Identifier: Apache-2.0
Copyright Contributors to the Submariner project.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package metrics

import "github.com/prometheus/client_golang/prometheus"

const (
cidrLabel = "cidr"
)

var (
globalIPsAvailabilityGauge = prometheus.NewGaugeVec(
prometheus.GaugeOpts{
Name: "submariner_global_IP_availability",
Help: "Count of available global IPs per CIDR",
},
[]string{
cidrLabel,
},
)
globalIPsAllocatedGauge = prometheus.NewGaugeVec(
prometheus.GaugeOpts{
Name: "submariner_global_IP_allocated",
Help: "Count of global IPs allocated for Pods/Services per CIDR",
},
[]string{
cidrLabel,
},
)
)

func init() {
prometheus.MustRegister(globalIPsAvailabilityGauge, globalIPsAllocatedGauge)
}

func RecordAllocateGlobalIP(cidr string) {
globalIPsAllocatedGauge.With(prometheus.Labels{cidrLabel: cidr}).Inc()
globalIPsAvailabilityGauge.With(prometheus.Labels{cidrLabel: cidr}).Dec()
}

func RecordAllocateGlobalIPs(cidr string, count int) {
globalIPsAllocatedGauge.With(prometheus.Labels{cidrLabel: cidr}).Add(float64(count))
globalIPsAvailabilityGauge.With(prometheus.Labels{cidrLabel: cidr}).Sub(float64(count))
}

func RecordDeallocateGlobalIP(cidr string) {
globalIPsAllocatedGauge.With(prometheus.Labels{cidrLabel: cidr}).Dec()
globalIPsAvailabilityGauge.With(prometheus.Labels{cidrLabel: cidr}).Inc()
}

func RecordAvailability(cidr string, count int) {
globalIPsAvailabilityGauge.With(prometheus.Labels{cidrLabel: cidr}).Set(float64(count))
}
9 changes: 6 additions & 3 deletions pkg/ipam/ippool.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

"github.com/emirpasic/gods/maps/treemap"
"github.com/pkg/errors"
"github.com/submariner-io/submariner/pkg/globalnet/metrics"
)

type IPPool struct {
Expand Down Expand Up @@ -65,7 +66,7 @@ func NewIPPool(cidr string) (*IPPool, error) {
pool.available.Put(intIP, ip)
}

// TODO: RecordAvailability(cidr, size)
metrics.RecordAvailability(cidr, size)

return pool, nil
}
Expand Down Expand Up @@ -97,7 +98,7 @@ func (p *IPPool) allocateOne() ([]string, error) {
iter := p.available.Iterator()
if iter.Last() {
p.available.Remove(iter.Key())
// TODO: RecordAllocateGlobalIP(p.cidr)
metrics.RecordAllocateGlobalIP(p.cidr)

return []string{iter.Value().(string)}, nil
}
Expand Down Expand Up @@ -149,7 +150,7 @@ func (p *IPPool) Allocate(num int) ([]string, error) {
firstIntIP++
}

// TODO: RecordAllocateGlobalIPs(p.cidr, num)
metrics.RecordAllocateGlobalIPs(p.cidr, num)

return retIPs, nil
}
Expand All @@ -169,6 +170,7 @@ func (p *IPPool) Release(ips ...string) error {
}

p.available.Put(StringIPToInt(ip), ip)
metrics.RecordDeallocateGlobalIP(p.cidr)
}

return nil
Expand Down Expand Up @@ -201,6 +203,7 @@ func (p *IPPool) Reserve(ips ...string) error {
for i := 0; i < num; i++ {
p.available.Remove(intIPs[i])
}
metrics.RecordAllocateGlobalIPs(p.cidr, num)

return nil
}
Expand Down

0 comments on commit c23c889

Please sign in to comment.