Skip to content

Enable metrics #324

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
openshift-merge-robot merged 2 commits into from
Jul 8, 2020
Merged

Enable metrics #324

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
0d9743e
Add metrics for machine interactions
Jun 4, 2020
fa7eef7
Revendor MAO
Jun 18, 2020
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
12 changes: 9 additions & 3 deletions cmd/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 (
configv1 "github.com/openshift/api/config/v1"
mapiv1beta1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
"github.com/openshift/machine-api-operator/pkg/controller/machine"
"github.com/openshift/machine-api-operator/pkg/metrics"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
"k8s.io/klog"
"k8s.io/klog/klogr"
Expand All @@ -43,6 +44,12 @@ func main() {
"print version and exit",
)

metricsAddress := flag.String(
"metrics-bind-address",
metrics.DefaultMachineMetricsAddress,
"Address for hosting metrics",
)

watchNamespace := flag.String(
"namespace",
"",
Expand Down Expand Up @@ -95,10 +102,9 @@ func main() {
LeaderElectionNamespace: *leaderElectResourceNamespace,
LeaderElectionID: "cluster-api-provider-aws-leader",
LeaseDuration: leaderElectLeaseDuration,
HealthProbeBindAddress: *healthAddr,
SyncPeriod: &syncPeriod,
// Disable metrics serving
MetricsBindAddress: "0",
HealthProbeBindAddress: *healthAddr,
MetricsBindAddress: *metricsAddress,
}

if *watchNamespace != "" {
Expand Down
10 changes: 7 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ require (
github.com/aws/aws-sdk-go v1.15.66
github.com/blang/semver v3.5.1+incompatible
github.com/go-logr/logr v0.1.0
github.com/golang/mock v1.2.0
github.com/golang/mock v1.3.1
github.com/onsi/ginkgo v1.12.0
github.com/onsi/gomega v1.8.1
github.com/openshift/machine-api-operator v0.2.1-0.20200611014855-9a69f85c32dd
github.com/openshift/api v0.0.0-20200424083944-0422dc17083e
github.com/openshift/machine-api-operator v0.2.1-0.20200701225707-950912b03628

// kube 1.18
k8s.io/api v0.18.2
Expand All @@ -22,4 +23,7 @@ require (
sigs.k8s.io/yaml v1.2.0
)

replace sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20200612013036-1a97c62077cb
replace (
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20200618031251-e16dd65fdd85
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20200618001858-af08a66b92de
)
87 changes: 19 additions & 68 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions pkg/actuators/machine/instances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/aws/aws-sdk-go/aws/awserr"
machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
mapierrors "github.com/openshift/machine-api-operator/pkg/controller/machine"
"github.com/openshift/machine-api-operator/pkg/metrics"
"k8s.io/klog"
awsproviderv1 "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsprovider/v1beta1"

Expand Down Expand Up @@ -355,6 +356,11 @@ func launchInstance(machine *machinev1.Machine, machineProviderConfig *awsprovid
}
}
}
metrics.RegisterFailedInstanceCreate(&metrics.MachineLabels{
Copy link
Member

@enxebre enxebre Jun 5, 2020

Choose a reason for hiding this comment

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

how are this metrics actually being exposed?
wouldn't this need to metrics.Registry.MustRegister(failedInstanceCreateCount) or anything?
https://github.com/kubernetes-sigs/controller-runtime/blob/c0438568a706ec61de31b92f4d76e7fb7e1007b9/pkg/internal/controller/metrics/metrics.go#L50

Copy link
Author

@Danil-Grigorev Danil-Grigorev Jun 5, 2020

Choose a reason for hiding this comment

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

This happens inside the init in https://github.com/openshift/machine-api-operator/pull/590/files#diff-7cbe8e056d62a2de30c7066e359bd9c9R68

Name: machine.Name,
Namespace: machine.Namespace,
Reason: err.Error(),
})
klog.Errorf("Error creating EC2 instance: %v", err)
return nil, mapierrors.CreateMachine("error creating EC2 instance: %v", err)
}
Expand Down
17 changes: 16 additions & 1 deletion pkg/actuators/machine/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2"
machinecontroller "github.com/openshift/machine-api-operator/pkg/controller/machine"
"github.com/openshift/machine-api-operator/pkg/metrics"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
errorutil "k8s.io/apimachinery/pkg/util/errors"
Expand Down Expand Up @@ -73,11 +74,15 @@ func (r *Reconciler) create() error {
}

if err = r.updateLoadBalancers(instance); err != nil {
metrics.RegisterFailedInstanceCreate(&metrics.MachineLabels{
Name: r.machine.Name,
Namespace: r.machine.Namespace,
Reason: err.Error(),
})
return fmt.Errorf("failed to updated update load balancers: %w", err)
}

klog.Infof("Created Machine %v", r.machine.Name)

if err = r.setProviderID(instance); err != nil {
return fmt.Errorf("failed to update machine object with providerID: %w", err)
}
Expand Down Expand Up @@ -111,6 +116,11 @@ func (r *Reconciler) delete() error {

terminatingInstances, err := terminateInstances(r.awsClient, existingInstances)
if err != nil {
metrics.RegisterFailedInstanceDelete(&metrics.MachineLabels{
Name: r.machine.Name,
Namespace: r.machine.Namespace,
Reason: err.Error(),
})
return fmt.Errorf("failed to delete instaces: %w", err)
}

Expand Down Expand Up @@ -169,6 +179,11 @@ func (r *Reconciler) update() error {

err = r.updateLoadBalancers(newestInstance)
if err != nil {
metrics.RegisterFailedInstanceUpdate(&metrics.MachineLabels{
Name: r.machine.Name,
Namespace: r.machine.Namespace,
Reason: err.Error(),
})
return fmt.Errorf("failed to updated update load balancers: %w", err)
}
} else {
Expand Down
43 changes: 36 additions & 7 deletions vendor/github.com/golang/mock/gomock/controller.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 26 additions & 7 deletions vendor/github.com/golang/mock/gomock/matchers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 31 additions & 7 deletions vendor/github.com/golang/mock/mockgen/mockgen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading