Skip to content

Update metrics settings #55

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

Merged
merged 2 commits into from
Oct 13, 2023
Merged

Update metrics settings #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b99af50
disables controller metrics server in favor of custom one
tonytheleg Oct 13, 2023
6824345
fix signalHandler panic
tonytheleg Oct 13, 2023
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: 0 additions & 15 deletions deploy/05-metrics_service.yaml
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ limitations under the License.
package main

import (
"context"
"flag"
"os"

"github.com/openshift/configure-goalert-operator/config"
"github.com/openshift/configure-goalert-operator/pkg/localmetrics"
"github.com/openshift/operator-custom-metrics/pkg/metrics"
"os"

// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
// to ensure that exec-entrypoint and run can make use of them.
Expand Down Expand Up @@ -55,10 +57,8 @@ func init() {
}

func main() {
var metricsAddr string
var enableLeaderElection bool
var probeAddr string
flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
flag.BoolVar(&enableLeaderElection, "leader-elect", false,
"Enable leader election for controller manager. "+
Expand All @@ -73,7 +73,7 @@ func main() {

mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: scheme,
MetricsBindAddress: metricsAddr,
MetricsBindAddress: "0",
Port: 9443,
HealthProbeBindAddress: probeAddr,
LeaderElection: enableLeaderElection,
Expand Down Expand Up @@ -120,7 +120,7 @@ func main() {
WithRoute().
GetConfig()

if err = metrics.ConfigureMetrics(ctrl.SetupSignalHandler(), *metricsServer); err != nil {
if err = metrics.ConfigureMetrics(context.TODO(), *metricsServer); err != nil {
setupLog.Error(err, "failed to configure custom metrics")
os.Exit(1)
}
Expand Down