kubernetes-sigs/prometheus-adapter
1
0
Fork 1
mirror of https://github.com/kubernetes-sigs/prometheus-adapter.git synced 2026-04-05 17:27:51 +00:00
Code Issues Projects Releases Packages Activity Actions

*: replace glog with klog

Browse source
This commit is contained in:
Sergiusz Urbaniak 2019-04-24 08:04:31 +02:00
parent f69586b71c
commit f18b6fd370
9 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cmd/adapter/adapter.go
View file

@ -27,7 +27,6 @@ import (
"os"
"time"
"github.com/golang/glog"
basecmd "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/cmd"
"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider"
resmetrics "github.com/kubernetes-incubator/metrics-server/pkg/apiserver/generic"
@ -36,6 +35,7 @@ import (
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/transport"
"k8s.io/component-base/logs"
"k8s.io/klog"
prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client"
mprom "github.com/directxman12/k8s-prometheus-adapter/pkg/client/metrics"
@ -83,14 +83,14 @@ func (cmd *PrometheusAdapter) makePromClient() (prom.Client, error) {
return nil, err
}
httpClient = prometheusCAClient
glog.Info("successfully loaded ca from file")
klog.Info("successfully loaded ca from file")
} else {
kubeconfigHTTPClient, err := makeKubeconfigHTTPClient(cmd.PrometheusAuthInCluster, cmd.PrometheusAuthConf)
if err != nil {
return nil, err
}
httpClient = kubeconfigHTTPClient
glog.Info("successfully using in-cluster auth")
klog.Info("successfully using in-cluster auth")
}
if cmd.PrometheusTokenFile != "" {
@ -246,26 +246,26 @@ func main() {
}
cmd.Name = "prometheus-metrics-adapter"
cmd.addFlags()
cmd.Flags().AddGoFlagSet(flag.CommandLine) // make sure we get the glog flags
cmd.Flags().AddGoFlagSet(flag.CommandLine) // make sure we get the klog flags
if err := cmd.Flags().Parse(os.Args); err != nil {
glog.Fatalf("unable to parse flags: %v", err)
klog.Fatalf("unable to parse flags: %v", err)
}
// make the prometheus client
promClient, err := cmd.makePromClient()
if err != nil {
glog.Fatalf("unable to construct Prometheus client: %v", err)
klog.Fatalf("unable to construct Prometheus client: %v", err)
}
// load the config
if err := cmd.loadConfig(); err != nil {
glog.Fatalf("unable to load metrics discovery config: %v", err)
klog.Fatalf("unable to load metrics discovery config: %v", err)
}
// construct the provider
cmProvider, err := cmd.makeProvider(promClient, wait.NeverStop)
if err != nil {
glog.Fatalf("unable to construct custom metrics provider: %v", err)
klog.Fatalf("unable to construct custom metrics provider: %v", err)
}
// attach the provider to the server, if it's needed
@ -276,7 +276,7 @@ func main() {
// construct the external provider
emProvider, err := cmd.makeExternalProvider(promClient, wait.NeverStop)
if err != nil {
glog.Fatalf("unable to construct external metrics provider: %v", err)
klog.Fatalf("unable to construct external metrics provider: %v", err)
}
// attach the provider to the server, if it's needed
@ -286,12 +286,12 @@ func main() {
// attach resource metrics support, if it's needed
if err := cmd.addResourceMetricsAPI(promClient); err != nil {
glog.Fatalf("unable to install resource metrics API: %v", err)
klog.Fatalf("unable to install resource metrics API: %v", err)
}
// run the server
if err := cmd.Run(wait.NeverStop); err != nil {
glog.Fatalf("unable to run custom metrics adapter: %v", err)
klog.Fatalf("unable to run custom metrics adapter: %v", err)
}
}