Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add prometheus metrics #190

Merged
merged 1 commit into from
Aug 7, 2023
Merged

feat: add prometheus metrics #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions cmd/controller-manager/app/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ type Options struct {

MaxPodListers int64
EnablePodPruning bool

PrometheusMetrics bool
PrometheusAddr string
PrometheusPort uint16
PrometheusQuantiles map[string]string
}

func NewOptions() *Options {
Expand Down Expand Up @@ -123,6 +128,16 @@ func (o *Options) AddFlags(flags *pflag.FlagSet, allControllers []string, disabl
flags.BoolVar(&o.EnablePodPruning, "enable-pod-pruning", false, "Enable pod pruning for pod informer. "+
"Enabling this can reduce memory usage of the pod informer, but will disable pod propagation.")
o.addKlogFlags(flags)

flags.BoolVar(&o.PrometheusMetrics, "export-prometheus", true, "Whether to expose metrics through a prometheus endpoint")
flags.StringVar(&o.PrometheusAddr, "prometheus-addr", "", "Prometheus collector address")
flags.Uint16Var(&o.PrometheusPort, "prometheus-port", 9090, "Prometheus collector port")
flags.StringToStringVar(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to pass quantiles as parameters to the controller? Kind of rare.

&o.PrometheusQuantiles,
"prometheus-quantiles",
map[string]string{"0.5": "0.01", "0.95": "0.01", "0.99": "0.002"},
"prometheus summary objective quantiles",
)
}

func (o *Options) addKlogFlags(flags *pflag.FlagSet) {
Expand Down
23 changes: 22 additions & 1 deletion cmd/controller-manager/app/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package app
import (
"fmt"
"regexp"
"strconv"
"time"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -37,6 +38,7 @@ import (
"github.com/kubewharf/kubeadmiral/pkg/controllers/common"
controllercontext "github.com/kubewharf/kubeadmiral/pkg/controllers/context"
"github.com/kubewharf/kubeadmiral/pkg/stats"
prometheusstats "github.com/kubewharf/kubeadmiral/pkg/stats/prometheus"
clusterutil "github.com/kubewharf/kubeadmiral/pkg/util/cluster"
"github.com/kubewharf/kubeadmiral/pkg/util/informermanager"
)
Expand Down Expand Up @@ -90,7 +92,26 @@ func createControllerContext(opts *options.Options) (*controllercontext.Context,
return nil, fmt.Errorf("failed to create component config: %w", err)
}

metrics := stats.NewMock("", "kube-federation-manager", false)
var metrics stats.Metrics
if opts.PrometheusMetrics {
quantiles := map[float64]float64{}
for qStr, eStr := range opts.PrometheusQuantiles {
q, err := strconv.ParseFloat(qStr, 64)
if err != nil {
return nil, fmt.Errorf("invalid float %q: %w", qStr, err)
}

e, err := strconv.ParseFloat(eStr, 64)
if err != nil {
return nil, fmt.Errorf("invalid float %q: %w", eStr, err)
}

quantiles[q] = e
}
metrics = prometheusstats.New("kubeadmiral_controller_manager", opts.PrometheusAddr, opts.PrometheusPort, quantiles)
} else {
metrics = stats.NewMock("", "kubeadmiral_controller_manager", true)
}

kubeClientset, err := kubernetes.NewForConfig(restConfig)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions cmd/controller-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"os"

"github.com/spf13/pflag"
_ "k8s.io/component-base/metrics/prometheus/clientgo"
"k8s.io/klog/v2"

"github.com/kubewharf/kubeadmiral/cmd/controller-manager/app"
Expand Down
12 changes: 10 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,21 @@ require (
github.com/evanphx/json-patch/v5 v5.6.0
github.com/go-logr/logr v1.2.4
github.com/google/go-cmp v0.5.9
github.com/jinzhu/copier v0.3.5
github.com/onsi/ginkgo/v2 v2.11.0
github.com/onsi/gomega v1.27.8
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.14.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2
golang.org/x/sync v0.2.0
golang.org/x/time v0.3.0
k8s.io/api v0.26.6
k8s.io/apiextensions-apiserver v0.26.6
k8s.io/apimachinery v0.26.6
k8s.io/client-go v0.26.6
k8s.io/component-base v0.26.6
k8s.io/klog/v2 v2.90.1
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/controller-runtime v0.14.1
Expand All @@ -30,6 +32,9 @@ require (
require (
github.com/BurntSushi/toml v1.0.0 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
Expand All @@ -49,18 +54,21 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/cobra v1.6.1 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.9.3 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
Expand Down
Loading